reformatted

Author: JasonLovesDoggo

cogs/ErrorHandler.py

@@ -34,15 +34,17 @@ async def on_slash_command_error(self, inter: ApplicationCommandInteraction, err
             # In debug mode we don't want to wait for them cause its fucking annoying.
             if self.TimeSinceStart() < self.waitTime and not self.debug_mode:
                 return await errorEmb(
-                    inter, f"The bot just started, please wait {round(self.waitTime - self.TimeSinceStart(), ndigits=2)}s."
+                    inter,
+                    f"The bot just started, please wait {round(self.waitTime - self.TimeSinceStart(), ndigits=2)}s.",
                 )
 
             # non real error handling
             if isinstance(error, CommandNotFound):
                 return await errorEmb(inter, "Command not found! use /help for a list of commands")
             elif isinstance(error, NotOwner):
                 await errorEmb(
-                    inter, f"You must be the owner of {inter.me.display_name} to use `{inter.application_command.name}`"
+                    inter,
+                    f"You must be the owner of {inter.me.display_name} to use `{inter.application_command.name}`",
                 )
             elif isinstance(error, HTTPException):
                 await errorEmb(inter, error.text)

cogs/blacklist.py

@@ -96,7 +96,8 @@ async def reason(self, inter, user: Member, reason: str):
             return await errorEmb(inter, f"{user.mention} is not in the blacklist")
         await self.blacklist.edit_reason(user.id, reason)
         await sucEmb(
-            inter, f"Edited {user.mention}'s reason in the blacklist to see the full reason use /blacklist info {user.mention}"
+            inter,
+            f"Edited {user.mention}'s reason in the blacklist to see the full reason use /blacklist info {user.mention}",
         )
 
     @commands.has_permissions(manage_messages=True)
@@ -130,9 +131,17 @@ async def remove(self, inter, user: Member):
                 required=True,
             ),
             Option(
-                "tickets", description="Whether to blacklist the user from using tickets", type=OptionType.boolean, required=True
+                "tickets",
+                description="Whether to blacklist the user from using tickets",
+                type=OptionType.boolean,
+                required=True,
+            ),
+            Option(
+                "tags",
+                description="Whether to blacklist the user from using tags",
+                type=OptionType.boolean,
+                required=True,
             ),
-            Option("tags", description="Whether to blacklist the user from using tags", type=OptionType.boolean, required=True),
             Option(
                 "expires",
                 description="When the blacklist should expire (e.g. 1w, 5m, never)",
@@ -193,7 +202,8 @@ async def blacklist_list(self, inter):
                 emb = Embed(color=self.bot.config.colors.invis, description="")
                 for user in blacklist_list:
                     emb.add_field(
-                        name=f"**{self.get_user(user.id).name}**", value=f"Expires: {user.get_expiry}\nReason: {user.reason}\n"
+                        name=f"**{self.get_user(user.id).name}**",
+                        value=f"Expires: {user.get_expiry}\nReason: {user.reason}\n",
                     )
 
                 blacklist_embs.append(emb)

cogs/fun_cmds.py

@@ -78,28 +78,27 @@ async def spotifyinfo(self, inter: ApplicationCommandInteraction, user: Member):
         e.add_field(
             name="Duration",
             value=(
-                    f"{cur.seconds // 60:02}:{cur.seconds % 60:02}"
-                    + f" {bar} "
-                    + f"{dur.seconds // 60:02}:"
-                    + f"{dur.seconds % 60:02}"
+                f"{cur.seconds // 60:02}:{cur.seconds % 60:02}"
+                + f" {bar} "
+                + f"{dur.seconds // 60:02}:"
+                + f"{dur.seconds % 60:02}"
             ),
             inline=False,
         )
         await inter.send(embed=e)
 
-    @commands.slash_command(name="poll",
-                            description="Make a Poll enter a question atleast 2 options and upto 6 options.")
+    @commands.slash_command(name="poll", description="Make a Poll enter a question atleast 2 options and upto 6 options.")
     @commands.has_permissions(manage_messages=True)
     async def poll(
-            self,
-            inter,
-            question,
-            choice1,
-            choice2,
-            choice3=None,
-            choice4=None,
-            choice5=None,
-            choice6=None,
+        self,
+        inter,
+        question,
+        choice1,
+        choice2,
+        choice3=None,
+        choice4=None,
+        choice5=None,
+        choice6=None,
     ):
         """
         Makes a poll quickly.
@@ -116,8 +115,7 @@ async def poll(
 
         embed = disnake.Embed(title=question, description=choices_str, colour=0xFFFFFF)
 
-        embed.set_footer(
-            text=f'{f"Poll by {inter.author}" if inter.author else ""} • {datetime.utcnow().strftime("%m/%d/%Y")}')
+        embed.set_footer(text=f'{f"Poll by {inter.author}" if inter.author else ""} • {datetime.utcnow().strftime("%m/%d/%Y")}')
 
         await inter.response.send_message(embed=embed)
         poll = await inter.original_message()  # Gets the message wich got sent
@@ -169,8 +167,7 @@ async def triggered(self, inter, member: disnake.Member = None):
         """Time to get triggered."""
         if not member:
             member = inter.author
-        trigImg = await self.bot.session.get(
-            f"https://some-random-api.ml/canvas/triggered?avatar={member.display_avatar.url}")
+        trigImg = await self.bot.session.get(f"https://some-random-api.ml/canvas/triggered?avatar={member.display_avatar.url}")
         imageData = io.BytesIO(await trigImg.read())
         await inter.send(file=disnake.File(imageData, "triggered.gif"))
 
@@ -201,8 +198,7 @@ async def invert(self, inter, member: disnake.Member = None):
         """Invert your profile picture."""
         if not member:
             member = inter.author
-        trigImg = await self.bot.session.get(
-            f"https://some-random-api.ml/canvas/invert/?avatar={member.display_avatar.url}")
+        trigImg = await self.bot.session.get(f"https://some-random-api.ml/canvas/invert/?avatar={member.display_avatar.url}")
         imageData = io.BytesIO(await trigImg.read())
         await inter.send(file=disnake.File(imageData, "invert.png"))
 
@@ -212,8 +208,7 @@ async def pixelate(self, inter, member: disnake.Member = None):
         """Turn yourself into pixels"""
         if not member:
             member = inter.author
-        trigImg = await self.bot.session.get(
-            f"https://some-random-api.ml/canvas/pixelate/?avatar={member.display_avatar.url}")
+        trigImg = await self.bot.session.get(f"https://some-random-api.ml/canvas/pixelate/?avatar={member.display_avatar.url}")
         imageData = io.BytesIO(await trigImg.read())
         await inter.send(file=disnake.File(imageData, "pixelate.png"))
 
@@ -224,8 +219,7 @@ async def jail(self, inter, member: disnake.Member = None):
         if not member:
             member = inter.author
 
-        trigImg = await self.bot.session.get(
-            f"https://some-random-api.ml/canvas/jail?avatar={member.display_avatar.url}")
+        trigImg = await self.bot.session.get(f"https://some-random-api.ml/canvas/jail?avatar={member.display_avatar.url}")
         imageData = io.BytesIO(await trigImg.read())
         await inter.send(file=disnake.File(imageData, "jail.png"))
 
@@ -258,8 +252,7 @@ def reaction_check(m):
             await msg.edit(content=f"**{user.name}** and **{inter.author.name}** are enjoying a lovely beer together 🍻")
         except asyncio.TimeoutError:
             await msg.delete()
-            await inter.send(
-                f"well, doesn't seem like **{user.name}** wanted a beer with you **{inter.author.name}** ;-;")
+            await inter.send(f"well, doesn't seem like **{user.name}** wanted a beer with you **{inter.author.name}** ;-;")
         except disnake.Forbidden:
             # Yeah so, bot doesn't have reaction permission, drop the "offer" word
             beer_offer = f"**{user.name}**, you got a 🍺 from **{inter.author.name}**"
@@ -409,8 +402,7 @@ def check(msg):
     async def bored(self, inter):
         """Returns an activity"""
         async with HTTPSession() as activitySession:
-            async with activitySession.get(f"https://boredapi.com/api/activity",
-                                           ssl=False) as activityData:  # keep as http
+            async with activitySession.get(f"https://boredapi.com/api/activity", ssl=False) as activityData:  # keep as http
                 activity = await activityData.json()
                 await inter.send(activity["activity"])
 
@@ -490,7 +482,8 @@ async def urlshortner(self, inter, url: str):
             embed = disnake.Embed(
                 title=f"URL created for: {url.replace('http://', '').replace('https://', '')}",
                 color=0xFFFFFF,
-                description=f"Your shortend URL is: {response.json()['short_url']}, or click [here]({response.json()['short_url']}) to visit it.")
+                description=f"Your shortend URL is: {response.json()['short_url']}, or click [here]({response.json()['short_url']}) to visit it.",
+            )
             embed.set_footer(text=f"Requested by: {inter.author.name}")
             return await inter.send(embed=embed)
         else:

cogs/staff.py

@@ -369,7 +369,8 @@ def check(m):
         await sucEmb(inter, "Successfully created message. To add more buttons use `/add_button`")
 
     @commands.slash_command(
-        name="add-button", description="Add a button to a previously created message." " Use /initialise-message for that."
+        name="add-button",
+        description="Add a button to a previously created message." " Use /initialise-message for that.",
     )
     @commands.guild_only()
     @commands.has_role("Staff")
@@ -433,7 +434,8 @@ async def edit_message(self, inter, message_id, channel: disnake.TextChannel):
 
         if not exists:
             return await errorEmb(
-                inter, "The message does not exist in the Database to initialise a message use" " ``/initialise-message``."
+                inter,
+                "The message does not exist in the Database to initialise a message use" " ``/initialise-message``.",
             )
 
         message = await channel.fetch_message(message_id)
@@ -473,7 +475,8 @@ async def delete_message(self, inter, message_id, channel: disnake.TextChannel):
 
         if not exists:
             return await errorEmb(
-                inter, "The message does not exist in the Database to initialise a message use" " ``/initialise-message``."
+                inter,
+                "The message does not exist in the Database to initialise a message use" " ``/initialise-message``.",
             )
 
         await self.reaction_roles.remove_messages(message_id)

cogs/support.py

@@ -142,7 +142,10 @@ def __init__(self, bot: OGIROID):
         description="Report a bug",
         options=[
             Option(
-                name="for", required=True, description="Select for what this bug report is.", choices=["Reddit-Bot", "Ogiroid"]
+                name="for",
+                required=True,
+                description="Select for what this bug report is.",
+                choices=["Reddit-Bot", "Ogiroid"],
             )
         ],
         connectors={"for": "bug_report_for"},
@@ -155,7 +158,10 @@ async def bug(self, inter, bug_report_for: str):
         description="Suggest something for the bot",
         options=[
             Option(
-                name="for", required=True, description="Select for what this suggestion is.", choices=["Reddit-Bot", "Ogiroid"]
+                name="for",
+                required=True,
+                description="Select for what this suggestion is.",
+                choices=["Reddit-Bot", "Ogiroid"],
             )
         ],
         connectors={"for": "suggestion_for"},

cogs/tags.py

@@ -263,7 +263,8 @@ async def rename(self, inter, name, new_name):
             elif not await self.valid_name(name):
                 return (
                     await QuickEmb(
-                        inter, "The tag's name must be only contain numbers, lowercase letters, spaces, underscores or dashes"
+                        inter,
+                        "The tag's name must be only contain numbers, lowercase letters, spaces, underscores or dashes",
                     )
                     .error()
                     .send()
@@ -310,7 +311,8 @@ async def add_alias(self, inter, name, alias):
             elif not await self.valid_name(name):
                 return (
                     await QuickEmb(
-                        inter, "The tag's name must be only contain numbers, lowercase letters, spaces, underscores or dashes"
+                        inter,
+                        "The tag's name must be only contain numbers, lowercase letters, spaces, underscores or dashes",
                     )
                     .error()
                     .send()

cogs/trivia.py

@@ -80,7 +80,17 @@ def check(m):
                         except asyncio.exceptions.TimeoutError:
                             await QuickEmb(channel, "Due to no response the quiz ended.").error().send()
                         else:
-                            if response.content.lower() not in ["yes", "y", "yeah", "yeah", "yep", "yup", "sure", "ok", "ye"]:
+                            if response.content.lower() not in [
+                                "yes",
+                                "y",
+                                "yeah",
+                                "yeah",
+                                "yep",
+                                "yup",
+                                "sure",
+                                "ok",
+                                "ye",
+                            ]:
                                 continue
                         await QuickEmb(channel, f"Your Score: {correct}/{tries - 1}. Thanks for playing.").send()
                         await self.flag_quiz.add_data(guess.author.id, tries - 1, correct)

cogs/welcome.py

@@ -32,7 +32,9 @@ async def on_member_join(self, member: disnake.Member):
             embed.add_field(name="Introductions:", value=f"Introduce yourself, {introduction.mention}", inline=True)
             embed.add_field(name="Roles:", value=f"Select some roles, {roles.mention}", inline=True)
             embed.add_field(
-                name="Reddit Bot Related:", value=f"Here for the Reddit bot? Checkout {reddit_bot.mention}", inline=True
+                name="Reddit Bot Related:",
+                value=f"Here for the Reddit bot? Checkout {reddit_bot.mention}",
+                inline=True,
             )
             embed.add_field(name="Rules:", value=f"Checkout the rules, {rules.mention}", inline=True)
             embed.set_thumbnail(url=member.display_avatar)

utils/DBhandlers.py

@@ -451,7 +451,8 @@ async def create_message(self, message_id: int, role_id: int, emoji: str):
     async def increment_roles_given(self, message_id: str, emoji: str):
         """increments the roles given out for a message"""
         await self.db.execute(
-            "UPDATE reaction_roles SET roles_given = roles_given + 1 WHERE message_id = ? AND emoji = ?", [message_id, emoji]
+            "UPDATE reaction_roles SET roles_given = roles_given + 1 WHERE message_id = ? AND emoji = ?",
+            [message_id, emoji],
         )
         await self.db.commit()
         # todo: cache remove below
@@ -466,7 +467,8 @@ async def remove_message(self, message_id: int, emoji: str, role_id: int):
         if not msg:
             raise ReactionNotFound
         await self.db.execute(
-            "DELETE FROM reaction_roles WHERE message_id = ? AND emoji = ? AND role_id = ?", [message_id, emoji, role_id]
+            "DELETE FROM reaction_roles WHERE message_id = ? AND emoji = ? AND role_id = ?",
+            [message_id, emoji, role_id],
         )
         await self.db.commit()
         self.messages.remove(msg)

utils/leveling/leveling_system.py

@@ -408,7 +408,14 @@ def _determine_no_xp(self, message: Message) -> bool:
         return any([has_no_xp_role, in_no_xp_channel])
 
     async def _update_record(
-        self, member: Union[Member, int], level: int, xp: int, total_xp: int, guild_id: int, name: Optional[str] = None, **kwargs
+        self,
+        member: Union[Member, int],
+        level: int,
+        xp: int,
+        total_xp: int,
+        guild_id: int,
+        name: Optional[str] = None,
+        **kwargs,
     ) -> None:
         maybe_new_record = kwargs.get("maybe_new_record", False)
         if maybe_new_record and not name: