From dae2d4901c0ce62d9f3ba1e257fdf2e030d10159 Mon Sep 17 00:00:00 2001
From: Fluffy-Bean <michal-gdula@protonmail.com>
Date: Mon, 11 Sep 2023 23:32:21 +0100
Subject: [PATCH] Further cleanup to make Deepsource happy

---
 lynxie/commands/animals.py |  6 ++++--
 lynxie/commands/help.py    |  3 ++-
 lynxie/commands/image.py   | 12 ++++++++----
 lynxie/commands/music.py   | 17 ++++++-----------
 lynxie/config.py           |  2 +-
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/lynxie/commands/animals.py b/lynxie/commands/animals.py
index 72c17d8..cb5a2a1 100644
--- a/lynxie/commands/animals.py
+++ b/lynxie/commands/animals.py
@@ -17,12 +17,14 @@ class Animals(commands.Cog):
         animal_choice = animal_choice.lower().strip() or None
 
         if not animal_choice:
-            error = f"You need to specify an animal! Try one of these: {', '.join(TINYFOX_ANIMALS)}"
+            error = f"You need to specify an animal! " \
+                    f"Try one of these: {', '.join(TINYFOX_ANIMALS)}"
             await ctx.reply(embed=error_message(error))
             return
 
         if animal_choice not in TINYFOX_ANIMALS:
-            error = f"That animal doesn't exist! Try one of these: {', '.join(TINYFOX_ANIMALS)}"
+            error = f"That animal doesn't exist! " \
+                    f"Try one of these: {', '.join(TINYFOX_ANIMALS)}"
             await ctx.reply(embed=error_message(error))
             return
 
diff --git a/lynxie/commands/help.py b/lynxie/commands/help.py
index 43409fd..1dca2e4 100644
--- a/lynxie/commands/help.py
+++ b/lynxie/commands/help.py
@@ -14,7 +14,8 @@ class Help(commands.Cog):
             "play <url>": "Play a song from YouTube, SoundCloud, etc.",
             "stop": "Stop the current song and leave the voice channel",
             "animal <animal>": "Get a random image of an animal!",
-            "overlay <image> <style>": "Overlay an image with a style, e.g. `bubble mask`",
+            "overlay <image> <style>": "Overlay an image with a "
+                                       "style, e.g. `bubble mask`",
             "saveable": "Turn image into a GIF to save within Discord",
         }
 
diff --git a/lynxie/commands/image.py b/lynxie/commands/image.py
index d89db2d..8f95815 100644
--- a/lynxie/commands/image.py
+++ b/lynxie/commands/image.py
@@ -57,13 +57,15 @@ class Img(commands.Cog):
 
         if not overlay_choice or overlay_choice not in IMAGE_OVERLAYS:
             error = (
-                f"Invalid overlay choice! Use one of these: {', '.join(IMAGE_OVERLAYS)}"
+                f"Invalid overlay choice! Use one of "
+                f"these: {', '.join(IMAGE_OVERLAYS)}"
             )
             await ctx.reply(embed=error_message(error))
             return
 
         if overlay_style not in IMAGE_OVERLAYS[overlay_choice]["options"]:
-            error = f"{overlay_choice} has these options: {', '.join(IMAGE_OVERLAYS[overlay_choice]['options'])}"
+            error = f"{overlay_choice} has these " \
+                    f"options: {', '.join(IMAGE_OVERLAYS[overlay_choice]['options'])}"
             await ctx.reply(embed=error_message(error))
             return
 
@@ -73,7 +75,8 @@ class Img(commands.Cog):
         ).lower()
         file_extension = file_name.split(".")[-1]
         if file_extension not in IMAGE_EXTENSIONS:
-            error = f"Unsupported file type! Use one of these: {', '.join(IMAGE_EXTENSIONS)}"
+            error = f"Unsupported file type! Use one " \
+                    f"of these: {', '.join(IMAGE_EXTENSIONS)}"
             await ctx.reply(embed=error_message(error))
             return
 
@@ -188,7 +191,8 @@ class Img(commands.Cog):
         ).lower()
         file_extension = file_name.split(".")[-1]
         if file_extension not in IMAGE_EXTENSIONS:
-            error = f"Unsupported file type! Use one of these: {', '.join(IMAGE_EXTENSIONS)}"
+            error = f"Unsupported file type! Use one " \
+                    f"of these: {', '.join(IMAGE_EXTENSIONS)}"
             await ctx.reply(embed=error_message(error))
             return
 
diff --git a/lynxie/commands/music.py b/lynxie/commands/music.py
index 874f368..6ae99f7 100644
--- a/lynxie/commands/music.py
+++ b/lynxie/commands/music.py
@@ -22,18 +22,13 @@ class Music(commands.Cog):
     @commands.command()
     async def play(self, ctx, *, url):
         async with ctx.typing():
-            try:
-                song_info = ytdl.extract_info(url, download=False)
-                ctx.voice_client.play(
-                    discord.FFmpegPCMAudio(song_info["url"], **ffmpeg_options)
+            song_info = ytdl.extract_info(url, download=False)
+            ctx.voice_client.play(
+                discord.FFmpegPCMAudio(
+                    song_info["url"],
+                    **ffmpeg_options
                 )
-            except Exception as err:
-                error = "An error occurred while processing this request." + str(err)
-                await ctx.reply(
-                    embed=error_message(error),
-                    mention_author=False,
-                )
-                return
+            )
 
         embed = discord.Embed(
             title="Now playing",
diff --git a/lynxie/config.py b/lynxie/config.py
index b1dedef..79e28bd 100644
--- a/lynxie/config.py
+++ b/lynxie/config.py
@@ -17,7 +17,7 @@ LYNXIE_PREFIX = "?"
 DATA_PATH = os.path.join("lynxie", "data")
 ASSETS_PATH = os.path.join("lynxie", "assets")
 
-DATABASE_URI = f"sqlite:///" + os.path.join(DATA_PATH, "lynxie.db")
+DATABASE_URI = "sqlite:///" + os.path.join(DATA_PATH, "lynxie.db")
 
 
 # https://tinyfox.dev/docs/