Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lynxie/config.py

lynxie/commands/e621.py

@@ -72,7 +72,7 @@ class E621(commands.Cog):
         embed.add_field(
             name="Score",
             value=f"^ {response['posts'][0]['score']['up']} | "
-                  f"v {response['posts'][0]['score']['down']}",
+            f"v {response['posts'][0]['score']['down']}",
         )
         embed.add_field(
             name="Favorites",
@@ -86,13 +86,14 @@ class E621(commands.Cog):
         )
         embed.add_field(
             name="Tags",
-            value=", ".join(response["posts"][0]["tags"]["general"]) or "No tags provided.",
+            value=", ".join(response["posts"][0]["tags"]["general"])
+            or "No tags provided.",
             inline=False,
         )
 
         embed.set_footer(
             text=f"ID: {response['posts'][0]['id']} | "
-                 f"Created: {response['posts'][0]['created_at']}"
+            f"Created: {response['posts'][0]['created_at']}"
         )
 
         embed.set_image(url=response["posts"][0]["file"]["url"])

lynxie/commands/image.py

@@ -19,10 +19,10 @@ class Img(commands.Cog):
     async def get_image_attachments(ctx):
         if ctx.message.attachments:
             return ctx.message.attachments[0]
-        elif ctx.message.reference:
+        if ctx.message.reference:
             if ctx.message.reference.resolved.attachments:
                 return ctx.message.reference.resolved.attachments[0]
-            elif (
+            if (
                 ctx.message.reference.resolved.embeds
                 and ctx.message.reference.resolved.embeds[0].image
             ):

lynxie/config.py

@@ -12,12 +12,11 @@ DISCORD_TOKEN = (
     or None
 )
 DISCORD_GUILD_ID = Object(id=1040757387033849976)
-
+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")