Merge pull request #37 from LewisProjects/development

1.7.1 patch

Author: JasonLovesDoggo

cogs/ErrorHandler.py

@@ -18,7 +18,7 @@ def __init__(self, bot: OGIROID):
         self.debug_mode = self.bot.config.debug
         self.waitTime = 25
 
-    def TimeSinceStart(self) -> int:
+    def TimeSinceStart(self) -> float:
         return round((datetime.now() - self.bot.uptime).total_seconds(), ndigits=1)
 
     # noinspection PyUnboundLocalVariable
@@ -29,16 +29,22 @@ async def on_slash_command_error(self, inter: ApplicationCommandInteraction, err
                 return
             elif error.__class__.__name__ in IGNORE_EXCEPTIONS:
                 return
-            if self.TimeSinceStart() < self.waitTime:  # Databases and internal caches might not be fully loaded yet
+
+            # Databases and internal caches might not be fully loaded yet.
+            # 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/animals.py

@@ -26,7 +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.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")
@@ -40,7 +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.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")
@@ -54,7 +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.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")
@@ -68,7 +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.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")
@@ -82,7 +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.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")
@@ -96,7 +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.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/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/botcmds.py

@@ -71,7 +71,7 @@ async def ping(self, inter):
         )
         embed.set_footer(
             text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.author.avatar,
+            icon_url=inter.author.display_avatar,
         )
         await inter.response.send_message(embed=embed)
 
@@ -246,8 +246,7 @@ async def whois(self, inter, *, user: disnake.Member = None):
 
         e.colour = 0xFFFFFF
 
-        if user.avatar:
-            e.set_thumbnail(url=user.avatar.url)
+        e.set_thumbnail(url=user.display_avatar.url)
 
         if isinstance(user, disnake.User):
             e.set_footer(text="This member is not in this server.")
@@ -267,8 +266,8 @@ async def avatar(self, inter: disnake.ApplicationCommandInteraction, user: disna
             user = inter.author
 
         embed = disnake.Embed(title=f"{user}'s avatar")
-        embed.set_image(url=user.avatar.url)
-        embed.set_author(name=f"{user}", icon_url=user.avatar.url)
+        embed.set_image(url=user.display_avatar.url)
+        embed.set_author(name=f"{user}", icon_url=user.display_avatar.url)
         await inter.send(embed=embed)
 
 

cogs/fun_cmds.py

@@ -4,6 +4,7 @@
 import random
 import time
 from datetime import datetime, timezone
+from urllib import request
 
 import akinator as ak
 import disnake
@@ -12,6 +13,7 @@
 from disnake.ext import commands
 from disnake.utils import utcnow
 from dotenv import load_dotenv
+import requests
 
 from utils.CONSTANTS import morse
 from utils.assorted import renderBar
@@ -134,7 +136,7 @@ async def youtube(self, inter):
             )
             embed.set_footer(
                 text=f"Command issued by: {inter.author.name}",
-                icon_url=inter.author.avatar,
+                icon_url=inter.author.display_avatar,
             )
             await inter.send(embed=embed)
         else:
@@ -151,7 +153,7 @@ async def joke(self, inter):
         embed = disnake.Embed(title="Joke!", description=data["joke"], color=0xFFFFFF)
         embed.set_footer(
             text=f"Command issued by: {inter.author.name}",
-            icon_url=inter.message.author.avatar,
+            icon_url=inter.message.author.display_avatar,
         )
         await inter.send(embed=embed)
 
@@ -165,7 +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.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"))
 
@@ -182,7 +184,7 @@ async def amongus(self, inter, member: disnake.Member = None):
             member = inter.author
         impostor = random.choice(["true", "false"])
         apikey = os.getenv("SRA_API_KEY")
-        uri = f"https://some-random-api.ml/premium/amongus?username={member.name}&avatar={member.avatar.url}&impostor={impostor}&key={apikey}"
+        uri = f"https://some-random-api.ml/premium/amongus?username={member.name}&avatar={member.display_avatar.url}&impostor={impostor}&key={apikey}"
         resp = await self.bot.session.get(uri)
         if 300 > resp.status >= 200:
             fp = io.BytesIO(await resp.read())
@@ -196,7 +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.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"))
 
@@ -206,7 +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.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"))
 
@@ -217,7 +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.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"))
 
@@ -461,6 +463,32 @@ async def info(self, inter, pokem: str = commands.ParamInfo(name="pokemon", desc
             return await errorEmb(inter, f"{key}")
         return await inter.send(embed=embed)
 
+    @commands.slash_command(name="urltoqr", description="Converts a URL to a QR code.")
+    async def urltoqr(self, inter, url: str, size: int):
+        url = url.replace("http://", "").replace("https://", "")
+        qr = f"https://api.qrserver.com/v1/create-qr-code/?size={size}x{size}&data={url}"
+        embed = disnake.Embed(title=f"URL created for: {url}", color=0xFFFFFF)
+        embed.set_image(url=qr)
+        embed.set_footer(text=f"Requested by: {inter.author.name}")
+        return await inter.send(embed=embed)
+
+    @commands.slash_command(name="urlshortner", description="Shortens a URL.")
+    async def urlshortner(self, inter, url: str):
+        # checking if url starts with http:// or https://, if it does not, adding https:// towards the start
+        if not url.startswith("http://") and not url.startswith("https://"):
+            url = f"https://{url}"
+        response = requests.post(f"https://u.jasoncodes.ca/add/{url}")
+        if response.status_code == 200:
+            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.",
+            )
+            embed.set_footer(text=f"Requested by: {inter.author.name}")
+            return await inter.send(embed=embed)
+        else:
+            return await errorEmb(inter, "An unexpected error occurred! Please try again later.")
+
 
 def setup(bot):
     bot.add_cog(Fun(bot))

cogs/help.py

@@ -2,6 +2,7 @@
 from disnake.ext import commands
 
 from utils.bot import OGIROID
+from utils.pagination import CreatePaginator
 
 
 class HelpCommand(commands.Cog, name="Help"):
@@ -14,38 +15,34 @@ def __init__(self, bot: OGIROID):
     @commands.slash_command(name="help", description="Lists all commands")
     async def help(self, inter):
         """Lists all commands"""
-        embed = disnake.Embed(title="Bot Commands", colour=self.COLOUR)
-        embed.set_author(
-            name="Ogiroid's help menu!",
-            url="https://freebie.codes",
-            icon_url="https://cdn.discordapp.com/avatars/984802008403959879/7016c34bd6bce62f9b0f2534f8918c49.png?size=1024",
-        )
+        embeds = []
 
         cogs = self.bot.cogs.items()
         for cog_name, cog in cogs:
+            embed = disnake.Embed(title=cog.qualified_name, colour=self.COLOUR)
             if cog is None:
                 continue
             cmds = cog.get_slash_commands()
             name = cog.qualified_name
 
-            value = " ".join(f"`/{cmd.name}`" for cmd in cmds)
+            value = ""
+            for cmd in cmds:
+                value += f"`/{cmd.qualified_name}` - {cmd.description}\n"
+                if cmd.children:
+                    for children, sub_command in cmd.children.items():
+                        try:
+                            value += f"`/{sub_command.qualified_name}` - {sub_command.description}\n"
+                        except AttributeError:
+                            pass
 
             if value == "":
                 continue
 
-            if name == "Tickets":
-                continue
-
-            if cog and cog.description:
-                value = "{0}\n{1}".format(cog.description, value)
-
-            embed.add_field(name=name, value=value)
+            embed.description = f"{cog.description}\n\n{value}"
+            embeds.append(embed)
 
-        embed.set_footer(
-            text="If you want more information on a particular command start typing out the command "
-            "and a description will show up"
-        )
-        await inter.send(embed=embed)
+        paginator = CreatePaginator(embeds, inter.author.id, timeout=300.0)
+        await inter.send(embed=embeds[0], view=paginator)
 
 
 def setup(bot: commands.Bot):