Merge pull request #65 from LewisProjects/development

hot fix

Author: LevaniVashadze

cogs/AI.py

@@ -1,10 +1,8 @@
 import base64
-import time
 from io import BytesIO
-
+import time
 import disnake
 from disnake.ext import commands
-
 from utils.bot import OGIROID
 
 
@@ -15,19 +13,11 @@ def __init__(self, bot: OGIROID):
     @commands.slash_command(description="Generates ai art")
     async def ai_art(self, inter: disnake.ApplicationCommandInteraction, text):
         ETA = int(time.time() + 60)
-        await inter.send(
-            f"Go grab a coffee this may take a while... ETA: <t:{ETA}:R>",
-            ephemeral=True,
-        )
-        response = await self.bot.session.post(
-            "https://backend.craiyon.com/generate", json={"prompt": text}
-        )
+        await inter.send(f"Go grab a coffee this may take a while... ETA: <t:{ETA}:R>", ephemeral=True)
+        response = await self.bot.session.post("https://backend.craiyon.com/generate", json={"prompt": text})
         r = await response.json()
         raw_images = r["images"]
-        images = [
-            disnake.File(BytesIO(base64.decodebytes(i.encode("utf-8"))), "image.png")
-            for i in raw_images
-        ]
+        images = [disnake.File(BytesIO(base64.decodebytes(i.encode("utf-8"))), "image.png") for i in raw_images]
 
         await inter.edit_original_response(files=images, content="Here you go!")
 

cogs/Animals.py

@@ -26,10 +26,7 @@ async def cat(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message(f"**Fun Fact: **" + data["fact"], embed=embed)
 
     @animal.sub_command(name="dog", description="Get a random dog picture")
@@ -43,10 +40,7 @@ async def dog(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message("**Fun Fact: **" + data["fact"], embed=embed)
 
     @animal.sub_command(name="bird", description="Get a random bird picture")
@@ -60,10 +54,7 @@ async def bird(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message("**Fun Fact: **" + data["fact"], embed=embed)
 
     @animal.sub_command(name="fox", description="Get a random fox picture")
@@ -77,10 +68,7 @@ async def fox(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message("**Fun Fact: **" + data["fact"], embed=embed)
 
     @animal.sub_command(name="panda", description="Get a random panda picture")
@@ -94,10 +82,7 @@ async def panda(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message("**Fun Fact: **" + data["fact"], embed=embed)
 
     @animal.sub_command(name="koala", description="Get a random cat picture")
@@ -111,10 +96,7 @@ async def koala(self, inter):
             color=0xFFFFFF,
         )
         embed.set_image(url=data["image"])
-        embed.set_footer(
-            text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.display_avatar,
-        )
+        embed.set_footer(text=f"Command issued by: {inter.author.name}", icon_url=inter.author.display_avatar)
         await inter.response.send_message("**Fun Fact: **" + data["fact"], embed=embed)
 
 

cogs/Birthdays.py

@@ -1,15 +1,15 @@
 import datetime
-import datetime as dt
-import random
 
 import disnake
+import datetime as dt
 from disnake.ext import commands, tasks
+import random
 
-from utils.CONSTANTS import months, congrats_messages
 from utils.DBhandlers import BirthdayHandler
-from utils.bot import OGIROID
 from utils.exceptions import UserAlreadyExists, UserNotFound
 from utils.shortcuts import QuickEmb, sucEmb, errorEmb
+from utils.CONSTANTS import months, congrats_messages
+from utils.bot import OGIROID
 
 
 class Birthday(commands.Cog):
@@ -30,18 +30,11 @@ def cog_unload(self):
     async def birthday(self, inter: disnake.ApplicationCommandInteraction):
         pass
 
-    @birthday.sub_command(
-        name="set", description="Set your birthday. Cant be removed without Staff."
-    )
+    @birthday.sub_command(name="set", description="Set your birthday. Cant be removed without Staff.")
     async def set(
         self,
         inter,
-        day: int = commands.Param(
-            name="day",
-            ge=1,
-            le=31,
-            description="The day of your birthday. Select carefully.",
-        ),
+        day: int = commands.Param(name="day", ge=1, le=31, description="The day of your birthday. Select carefully."),
         month: str = commands.Param(
             name="month",
             description="The month of your birthday. Select carefully.",
@@ -62,23 +55,17 @@ async def set(
         await sucEmb(inter, f"Your birthday has been set to {birth_date}")
 
     @commands.has_permissions(manage_roles=True)
-    @birthday.sub_command(
-        name="edit", description="Edit a users birthday. Can only be done by Staff."
-    )
+    @birthday.sub_command(name="edit", description="Edit a users birthday. Can only be done by Staff.")
     async def edit(
         self,
         inter,
-        day: int = commands.Param(
-            name="day", ge=1, le=31, description="The day of the birthday."
-        ),
+        day: int = commands.Param(name="day", ge=1, le=31, description="The day of the birthday."),
         month: str = commands.Param(
             name="month",
             description="The month of the birthday.",
             choices=months,
         ),
-        user: disnake.User = commands.Param(
-            name="user", description="User to edit the birthday of."
-        ),
+        user: disnake.User = commands.Param(name="user", description="User to edit the birthday of."),
     ):
         try:
             await self.birthday.update_user(user.id, f"{day}/{month}")
@@ -87,15 +74,11 @@ async def edit(
             return await errorEmb(inter, "The User doesn't have a birthday set")
 
     @commands.has_permissions(manage_roles=True)
-    @birthday.sub_command(
-        name="remove", description="Remove a birthday. Can only be done by Staff."
-    )
+    @birthday.sub_command(name="remove", description="Remove a birthday. Can only be done by Staff.")
     async def remove(
         self,
         inter: disnake.ApplicationCommandInteraction,
-        user: disnake.User = commands.Param(
-            name="user", description="Removes the birthday of this user"
-        ),
+        user: disnake.User = commands.Param(name="user", description="Removes the birthday of this user"),
     ):
         try:
             await self.birthday.delete_user(user.id)
@@ -105,9 +88,7 @@ async def remove(
         await sucEmb(inter, "The birthday has been removed")
 
     @birthday.sub_command(name="get", description="Get the birthday of a user")
-    async def get(
-        self, inter, user: disnake.User = commands.Param(name="user", default=None)
-    ):
+    async def get(self, inter, user: disnake.User = commands.Param(name="user", default=None)):
         if user is None:
             user = inter.author
         else:
@@ -117,13 +98,9 @@ async def get(
         if birthday is None:
             return await errorEmb(inter, "This user doesn't have a birthday set")
 
-        next_birthday = datetime.datetime.strptime(
-            birthday.birthday + f"/{dt.datetime.now().year}", "%d/%m/%Y"
-        )
+        next_birthday = datetime.datetime.strptime(birthday.birthday + f"/{dt.datetime.now().year}", "%d/%m/%Y")
         if next_birthday < datetime.datetime.now():
-            next_birthday = datetime.datetime.strptime(
-                birthday.birthday + f"/{dt.datetime.now().year + 1}", "%d/%m/%Y"
-            )
+            next_birthday = datetime.datetime.strptime(birthday.birthday + f"/{dt.datetime.now().year + 1}", "%d/%m/%Y")
         await QuickEmb(
             inter,
             f"{user.mention}'s birthday is in {(next_birthday - datetime.datetime.now()).days} Days."
@@ -151,18 +128,11 @@ async def birthday_check(self):
             # if the birthday is today, congratulate the user
             if user.birthday == today:
                 await member.add_roles(guild.get_role(self.bot.config.roles.birthday))
-                congrats_msg = await channel.send(
-                    f"{random.choice(congrats_messages)} {member.mention}! 🎂"
-                )
+                congrats_msg = await channel.send(f"{random.choice(congrats_messages)} {member.mention}! 🎂")
                 await congrats_msg.add_reaction("🥳")
             # If the birthday isn't today and the user still has the birthday role, remove it
-            elif (
-                user.birthday != today
-                and member.get_role(self.bot.config.roles.birthday) is not None
-            ):
-                await member.remove_roles(
-                    guild.get_role(self.bot.config.roles.birthday)
-                )
+            elif user.birthday != today and member.get_role(self.bot.config.roles.birthday) is not None:
+                await member.remove_roles(guild.get_role(self.bot.config.roles.birthday))
 
 
 def setup(bot):

cogs/Blacklist.py

@@ -64,40 +64,28 @@ async def blacklist_info(self, inter, user: Member):
         if not await self.blacklist.blacklisted(user.id):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
         bl_user = await self.blacklist.get_user(user.id)
-        embed = Embed(
-            title=f"Blacklisted user: {user.name}",
-            color=disnake.Color.random(seed=user.name),
-        )
+        embed = Embed(title=f"Blacklisted user: {user.name}", color=disnake.Color.random(seed=user.name))
         embed.add_field(name="Reason", value=bl_user.reason, inline=False)
         embed.add_field(name="Expires", value=bl_user.get_expiry, inline=False)
         embed.add_field(name="Bot", value=bl_user.bot)
         embed.add_field(name="Tickets", value=bl_user.tickets)
         embed.add_field(name="Tags", value=bl_user.tags)
         await inter.send(embed=embed)
 
-    @blacklist.sub_command_group(
-        name="edit", description="Edit a user in the blacklist"
-    )
+    @blacklist.sub_command_group(name="edit", description="Edit a user in the blacklist")
     async def edit(self, inter):
         pass
 
     @commands.has_permissions(manage_messages=True)
-    @edit.sub_command(
-        name="flags", description="Edit the user's blacklist flags in the blacklist"
-    )
+    @edit.sub_command(name="flags", description="Edit the user's blacklist flags in the blacklist")
     async def flags(self, inter, user: Member, bot: bool, tickets: bool, tags: bool):
         if not await self.blacklist.blacklisted(user.id):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
         await self.blacklist.edit_flags(user.id, bot, tickets, tags)
-        await sucEmb(
-            inter,
-            f"Edited {user.mention}'s blacklist flags to\nBot: {bot}, Tickets: {tickets}, Tags: {tags}",
-        )
+        await sucEmb(inter, f"Edited {user.mention}'s blacklist flags to\nBot: {bot}, Tickets: {tickets}, Tags: {tags}")
 
     @commands.has_permissions(manage_messages=True)
-    @edit.sub_command(
-        name="reason", description="Edit the user's blacklist reason in the blacklist"
-    )
+    @edit.sub_command(name="reason", description="Edit the user's blacklist reason in the blacklist")
     async def reason(self, inter, user: Member, reason: str):
         if not await self.blacklist.blacklisted(user.id):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
@@ -108,43 +96,29 @@ async def reason(self, inter, user: Member, reason: str):
         )
 
     @commands.has_permissions(manage_messages=True)
-    @edit.sub_command(
-        name="expiry", description="Edit the user's blacklist expiry in the blacklist"
-    )
+    @edit.sub_command(name="expiry", description="Edit the user's blacklist expiry in the blacklist")
     async def expiry(self, inter, user: Member, expires: str):
         if not await self.blacklist.blacklisted(user.id):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
         expiry = int((await timeconversions.convert(expires)).dt.timestamp())
         await self.blacklist.edit_expiry(user.id, expiry)
-        await sucEmb(
-            inter,
-            f"Edited the expiry of {user.mention}'s blacklist to expire {get_expiry(expiry)}",
-        )
+        await sucEmb(inter, f"Edited the expiry of {user.mention}'s blacklist to expire {get_expiry(expiry)}")
         await self.check_user_removal(await self.blacklist.get_user(user.id))
 
     @commands.has_permissions(manage_messages=True)
-    @blacklist.sub_command(
-        name="remove", description="Remove a user from the blacklist"
-    )
+    @blacklist.sub_command(name="remove", description="Remove a user from the blacklist")
     async def remove(self, inter, user: Member):
         if not await self.blacklist.blacklisted(user.id):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
         await self.blacklist.remove(user.id)
-        await sucEmb(
-            inter, f"{user.mention} has been removed from blacklist", ephemeral=False
-        )
+        await sucEmb(inter, f"{user.mention} has been removed from blacklist", ephemeral=False)
 
     @commands.has_permissions(manage_messages=True)
     @blacklist.sub_command(
         name="add",
         description="Add a user to the blacklist",
         options=[
-            Option(
-                "user",
-                description="User to blacklist",
-                type=OptionType.user,
-                required=True,
-            ),
+            Option("user", description="User to blacklist", type=OptionType.user, required=True),
             Option(
                 "bot",
                 description="Whether to blacklist the user from using the entire bot",
@@ -169,29 +143,12 @@ async def remove(self, inter, user: Member):
                 type=OptionType.string,
                 required=False,
             ),
-            Option(
-                "reason",
-                description="Reason for blacklisting the user",
-                type=OptionType.string,
-                required=False,
-            ),
+            Option("reason", description="Reason for blacklisting the user", type=OptionType.string, required=False),
         ],
     )
-    async def blacklist_add(
-        self,
-        inter,
-        user,
-        bot,
-        tickets,
-        tags,
-        reason="No Reason Specified",
-        expires="never",
-    ):
+    async def blacklist_add(self, inter, user, bot, tickets, tags, reason="No Reason Specified", expires="never"):
         if not any((bot, tickets, tags)):
-            return await errorEmb(
-                inter,
-                "You can't blacklist a user without specifying either bot, tickets and/or tags",
-            )
+            return await errorEmb(inter, "You can't blacklist a user without specifying either bot, tickets and/or tags")
         elif len(reason) > 900:
             return await errorEmb(inter, "Reason must be under 900 chars")
         elif user.id == inter.author.id:
@@ -251,16 +208,11 @@ async def blacklist_list(self, inter):
                 emb.description = f"Expires: {blacklist_list.get_expiry}\nReason: {blacklist_list.reason}\n"
                 blacklist_embs.append(emb)
 
-        blacklist_embs.append(
-            Embed(color=self.bot.config.colors.invis, description="The end ;D")
-        )
+        blacklist_embs.append(Embed(color=self.bot.config.colors.invis, description="The end ;D"))
         start_emb = Embed(title="Blacklist", color=self.bot.config.colors.invis)
         start_emb.description = f"There are currently {blacklist_count:,d} blacklisted user{'s' if blacklist_count > 1 else ''}, use the arrows below to navigate through them"
         blacklist_embs.insert(0, start_emb)
-        await inter.send(
-            embed=blacklist_embs[0],
-            view=CreatePaginator(blacklist_embs, inter.author.id),
-        )
+        await inter.send(embed=blacklist_embs[0], view=CreatePaginator(blacklist_embs, inter.author.id))
 
 
 def setup(bot):