Merge pull request #59 from BlueAtomic/fix-guild-logs

Fix guild logs
DynamatrixOSS · Aug 15, 2023 · 493f135 · 493f135
2 parents 58dfb94 + f5215b7
commit 493f135
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cogs/internallogs.py b/cogs/internallogs.py
@@ -12,7 +12,7 @@ def __init__(self, bot: Bot):
 
     @commands.Cog.listener()
     async def on_guild_join(self, guild: Guild):
-        result = (await selector("SELECT * FROM blacklist WHERE guild_id = %s", [guild.id]))[1]
+        result = await selector("SELECT * FROM blacklist WHERE guild_id = %s", [guild.id])
 
         if result:
             await guild.leave()
@@ -23,7 +23,7 @@ async def on_guild_join(self, guild: Guild):
         embed.add_field(name="Guild member count", value=guild.member_count, inline=True)
         embed.add_field(name="Current server count", value=len(self.bot.guilds), inline=True)
         if result:
-            embed.description = f'**THIS GUILD IS BLACKLISTED**\n**Reason:** {result}'
+            embed.description = f'**THIS GUILD IS BLACKLISTED**\n**Reason:** {result[1]}'
         if guild.icon is not None:
             embed.set_thumbnail(url=guild.icon)
         async with aiohttp.ClientSession() as client_session:
@@ -32,14 +32,14 @@ async def on_guild_join(self, guild: Guild):
 
     @commands.Cog.listener()
     async def on_guild_remove(self, guild: Guild):
-        result = (await selector("SELECT * FROM blacklist WHERE guild_id = %s", [guild.id]))[1]
+        result = await selector("SELECT * FROM blacklist WHERE guild_id = %s", [guild.id])
         embed = Embed(title="Left a guild!", color=Colors.red)
         embed.add_field(name="Name", value=guild.name, inline=True)
         embed.add_field(name="ID", value=guild.id, inline=True)
         embed.add_field(name="Guild member count", value=guild.member_count, inline=True)
         embed.add_field(name="Current server count", value=len(self.bot.guilds), inline=True)
         if result:
-            embed.description = f'**THIS GUILD IS BLACKLISTED**\n**Reason:** {result}'
+            embed.description = f'**THIS GUILD IS BLACKLISTED**\n**Reason:** {result[1]}'
         if guild.icon is not None:
             embed.set_thumbnail(url=guild.icon)
         async with aiohttp.ClientSession() as client_session:

diff --git a/utilities/database.py b/utilities/database.py
@@ -29,7 +29,7 @@ async def selector(query: str, variables: list):
     try:
         result = database.fetchall()[0]
     except IndexError:
-        return [False]
+        return ()
     database.close()
     cursor.close()
     return result