Fix bugs and add sync to debug

Author: gccody

Diff for: launcher.py

@@ -1,13 +1,14 @@
 import asyncio
 import atexit
 import glob
+import math
 from http.client import HTTPException
 
 import discord
 import numpy as np
 import requests
 from discord import Embed, NotFound, Interaction
-from discord.app_commands import CommandOnCooldown, MissingPermissions, BotMissingPermissions
+from discord.app_commands import CommandOnCooldown, MissingPermissions, BotMissingPermissions, TransformerError
 
 from lib.bot import Bot, IGNORE_EXCEPTIONS
 from lib.config import Config
@@ -19,8 +20,10 @@
 config = Config()
 TOTAL_GUILDS = len(requests.get("https://discord.com/api/v9/users/@me/guilds",
                                 headers={"Authorization": f"Bot {config.token}"}).json())
-SHARDS_LIST: list[int] = list(range(round((TOTAL_GUILDS / 1000) + 1)))
-CLUSTERS = round((len(SHARDS_LIST) / 2) + 1)
+GUILDS_PER_SHARD = 1000
+SHARDS_PER_CLUSTER = 100
+SHARDS_LIST: list[int] = list(range(math.ceil(TOTAL_GUILDS / GUILDS_PER_SHARD)))
+CLUSTERS = math.ceil(len(SHARDS_LIST) / SHARDS_PER_CLUSTER)
 SHARDS_SPLIT: list[np.ndarray[int]] = np.array_split(SHARDS_LIST, CLUSTERS)
 
 
@@ -37,7 +40,7 @@ async def on_command_error(ctx: Interaction, exc) -> None:
                 pass
             elif isinstance(exc, CommandOnCooldown):
                 embed: Embed = Embed(title='Command on Cooldown',
-                                     description=f"That command is on cooldown. Try again in {exc.retry_after:,.2f} seconds.",
+                                     description=f">>> That command is on cooldown. Try again in {exc.retry_after:,.2f} seconds.",
                                      colour=0xff0000)
                 await bot.send(ctx, embed=embed)
             elif isinstance(exc, MissingPermissions):
@@ -47,18 +50,21 @@ async def on_command_error(ctx: Interaction, exc) -> None:
                 embed: Embed = Embed(title='Bot Missing Permissions', description=f">>> {exc}", colour=0xff0000)
                 await bot.send(ctx, embed=embed)
             elif isinstance(exc, HTTPException):
-                embed: Embed = Embed(title="Http Error", description='Message failed to send', colour=0xff0000)
+                embed: Embed = Embed(title="Http Error", description='>>> Message failed to send', colour=0xff0000)
                 await bot.send(ctx, embed=embed)
             elif isinstance(exc, NotFound):
                 await bot.send(ctx,
-                               embed=Embed(title='Not Found Error', description='One or more items could not be found.',
+                               embed=Embed(title='Not Found Error', description='>>> One or more items could not be found.',
                                            colour=0xff0000))
+            elif isinstance(exc, TransformerError):
+                await bot.send(ctx,
+                               embed=Embed(title=':x: | Enter in the correct format', colour=0xff0000))
             elif hasattr(exc, "original"):
                 if isinstance(exc.original, HTTPException):
-                    embed: Embed = Embed(title="Http Error", description='Message failed to send', colour=0xff0000)
+                    embed: Embed = Embed(title="Http Error", description='>>> Message failed to send', colour=0xff0000)
                     await bot.send(ctx, embed=embed)
                 if isinstance(exc.original, discord.Forbidden):
-                    embed: Embed = Embed(title='Forbidden Error', description='Insufficient Permissions',
+                    embed: Embed = Embed(title='Forbidden Error', description='>>> Insufficient Permissions',
                                          colour=0xff0000)
                     await bot.send(ctx, embed=embed)
                 else:

Diff for: lib/bot/__init__.py

@@ -10,15 +10,17 @@
 import tzlocal
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from discord import Guild, Interaction, VoiceChannel
-from discord.app_commands import Command
+from discord.app_commands import Command, CommandOnCooldown, MissingPermissions, BotMissingPermissions
 from discord.embeds import Embed
-from discord.errors import NotFound
+from discord.errors import NotFound, HTTPException, InteractionResponded
 from discord.ext.commands import AutoShardedBot
 from discord.ext.commands.errors import CommandNotFound, BadArgument
+from discord import AutoShardedClient
 
 from lib.config import Config
 from lib.db import DB
-from lib.progress import Progress, Timer
+from lib.errors import BotNotReady
+from lib.progress import Progress, Timer, Loading
 from lib.urban import UrbanDictionary
 
 COMMAND_ERROR_REGEX = r"Command raised an exception: (.*?(?=: )): (.*)"
@@ -49,10 +51,10 @@ def __init__(self, shards: list[int], version: str):
         self.shard_progress.start()
 
     async def on_connect(self):
-        await self.tree.sync()
         while not self.shards_ready:
-            print('Shards Not Ready')
             await asyncio.sleep(.5)
+        self.tree.copy_global_to(guild=discord.Object(id="1064582321728143421"))
+        await self.tree.sync(guild=discord.Object(id="1064582321728143421"))
         self.register_guilds()
         asyncio.ensure_future(self.monitor_shutdown())
         print(f"Signed into {self.user.display_name}#{self.user.discriminator}")
@@ -71,29 +73,34 @@ async def on_interaction(self, ctx: Interaction):
             name_list, options = self.get_name(ctx.data, [])
             name = " ".join(name_list)
             self.db.insert.commands(command_name=name, guild_id=ctx.guild_id, user_id=ctx.user.id, params=json.dumps(options), ts=datetime.now().timestamp())
-            # self.db.run(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, ctx.guild_id,
-            #                 ctx.user.id, json.dumps(options), datetime.now().timestamp())
+            self.db.run(f"""INSERT INTO commands VALUES (?,?,?,?,?)""", name, ctx.guild_id,
+                            ctx.user.id, json.dumps(options), datetime.now().timestamp())
+
+
 
     @staticmethod
     async def send(ctx: Interaction, *args, **kwargs):
         if kwargs.get('embed'):
             embed: Embed = kwargs['embed']
-            if not isinstance(embed.colour, discord.Colour):
+            if embed.colour is None:
                 color = int("0x" + ''.join([random.choice('0123456789ABCDEF') for j in range(6)]), 16)
                 embed.colour = color
             embed.set_footer(text="Made by Gccody")
             embed.timestamp = datetime.now()
             # embed.set_thumbnail(url=self.logo_path)
             kwargs['embed'] = embed
+
         if ctx.is_expired():
             channel = ctx.channel
             if not isinstance(channel, VoiceChannel):
                 return await ctx.channel.send(*args, **kwargs)
         try:
-            await ctx.original_response()
-            return await ctx.followup.send(*args, **kwargs)
-        except NotFound:
             return await ctx.response.send_message(*args, **kwargs)
+        except InteractionResponded:
+            try:
+                return await ctx.followup.send(*args, **kwargs)
+            except NotFound:
+                return await ctx.channel.send(*args, **kwargs)
 
     async def monitor_shutdown(self):
         while True:
@@ -111,6 +118,7 @@ async def monitor_shutdown(self):
 
     def register_guilds(self):
         progress = Progress('Registering guilds', len(self.guilds))
+        progress.start()
         for guild in self.guilds:
             self.db.insert.guilds(id=guild.id)
             progress.next()
@@ -120,7 +128,6 @@ def register_guilds(self):
                 self.db.delete.guilds(id=guild.id)
         self.db.commit()
         self.ready = True
-        print('End')
         self.tasks.start()
 
     async def on_guild_join(self, guild: Guild):

Diff for: lib/cogs/Fun.py

@@ -48,7 +48,7 @@ async def eightball(self, ctx: Interaction, question: str):
             'Signs point to no',
             'Most likely not',
         ]
-        await ctx.response.send_message(embed=Embed(title=f':8ball: | {random.choice(responses)}, {ctx.user.display_name}'))
+        await self.bot.send(ctx, embed=Embed(title=f':8ball: | {random.choice(responses)}, {ctx.user.display_name}'))
 
     @app_commands.command(name='embed')
     @app_commands.describe(title='Title of embed', title_url='Url embeded into title', author='Author of the embed')