Merge branch 'rewrite' into rewrite

Author: Pythonic-Rainbow

cogs/channels.py

@@ -17,6 +17,8 @@ def get_news_role(ctx, channel: discord.TextChannel = None):
         ch = channel if channel else ctx.channel
         return utils.find(lambda r: r.name.startswith(ch.name.split('_')[1]), ctx.guild.roles)
 
+    '''
+    # Commented out. Insights competition among the libraries. Will re-evaluate usage.
     @commands.command()
     async def leaderboard(self, ctx):
         roles = [(r.name, len(r.members)) for r in ctx.guild.roles if 'news' in r.name]
@@ -25,6 +27,7 @@ async def leaderboard(self, ctx):
         for i, r in enumerate(roles):
             embed.add_field(name=f"{i + 1}. {r[0]}", value=f"**Subscribers:** {r[1]}")
         await ctx.send(embed=embed)
+    '''
 
     @commands.command()
     async def subscribe(self, ctx, channel: discord.TextChannel = None):

cogs/data.py

@@ -8,7 +8,6 @@ class Data:
     def __init__(self):
         self.connector = sqlite3.connect('storage.db')
         self.modEntry = self.ModEntry(self)
-        self.verificationEntry = self.VerificationEntry(self)
         self.taggingEntry = self.TaggingEntry(self)
 
         # Setup 'modLogs' Databases if isn't valid
@@ -26,19 +25,6 @@ def __init__(self):
         except Exception as error:
             pass  # Database table is already created
 
-        # Setup 'verification' Database if isn't valid
-        try:
-            # verification table container
-            connector.execute('''CREATE TABLE verification (
-                DISCORDID BIGINT NOT NULL,
-                USERNAME TEXT NOT NULL,
-                USERID INTEGER NOT NULL,
-                DATE TEXT NOT NULL
-            );''')
-
-        except Exception as error:
-            pass  # Database table is already created
-
         # Setup 'tagging' Database if isn't valid
         try:
             # Tagging table container
@@ -105,51 +91,6 @@ def update(self, id, **kwargs):
                 return False
             return True
 
-    class VerificationEntry:
-
-        def __init__(self, data):
-            self.Data = data
-            self.connector = data.connector
-            self.cursor = self.connector.cursor()
-
-        def insert(self, discordid, username, userid, date):
-            try:
-                self.cursor.execute(
-                    '''INSERT INTO verification (DISCORDID, USERNAME, USERID, DATE) VALUES (?, ?, ?, ?);''',
-                    (discordid, username, userid, date))
-                self.connector.commit()
-            except sqlite3.Error as error:
-                print(f'{error}')
-
-        def fetch(self, id):
-            index = 0
-            try:
-                self.cursor.execute('''SELECT * FROM verification''')
-            except sqlite3.Error as error:
-                print(f'{error}')
-
-            for discordid, username, userid, date in self.cursor.fetchall():
-                index += 1
-                if int(discordid) == id:
-                    return {
-                        "index": index,
-                        "discordid": discordid,
-                        "username": username,
-                        "userid": userid,
-                        "date": date
-                    }
-
-        def check_discordid(self, value):
-            try:
-                self.cursor.execute('''SELECT * FROM verification''')
-                for discordid, username, userid, date in self.cursor.fetchall():
-                    if discordid == value:
-                        return True
-                return False
-            except sqlite3.Error as error:
-                print(f'{error}')
-                return False
-
     class TaggingEntry:
 
         def __init__(self, data):
@@ -224,4 +165,4 @@ def check_identifier(self, identifier):
                 return False
             except sqlite3.Error as error:
                 print(f'{error}')
-                return False
+                return False

main.py

@@ -1,64 +1,64 @@
-import os
-import traceback
-
-import discord
-from discord.ext import commands
-
-from dotenv import load_dotenv
-
-from embed import default_embed
-
-load_dotenv()
-
-# A list containing all cogs that we want to load
-available_cogs = ['cogs.maintenance', 'cogs.logging', 'cogs.utility', 'cogs.channels', 'cogs.moderation',
-                  'cogs.tagging']
-
-# Disabled Cogs
-# 'cogs.verification'
-
-# Bot Init
-description = "Roblox API Server Documentation Bot"
-intent = discord.Intents.default()
-intent.members = True
-bot = commands.Bot(command_prefix='?', description=description, help_command=None)
-
-
-# Client Login
-@bot.event
-async def on_ready():
-    print(f"Logged in as {bot.user.name}, id: {bot.user.id}")
-    print("--")
-
-
-# Event Error. the args are required
-@bot.event
-async def on_error(event, *args, **kwargs):
-    channel = bot.get_channel(int(os.getenv('ERROR_LOGS_CHANNEL')))
-    emb = default_embed('Error (Event)', color=discord.Color.red())
-    emb.add_field(name="Event", value=event, inline=False)
-    emb.add_field(name="Traceback", value=traceback.format_exc(), inline=False)
-    await channel.send(embed=emb)
-
-
-# Command Error
-@bot.event
-async def on_command_error(ctx, error):
-    channel = bot.get_channel(int(os.getenv('ERROR_LOGS_CHANNEL')))
-    emb = default_embed('Error (Commands)', color=discord.Color.red())
-    emb.add_field(name="Error", value=error, inline=False)
-    emb.add_field(name="Command", value=ctx.command, inline=False)
-    emb.add_field(name="Message", value=ctx.message.content, inline=False)
-    await channel.send(embed=emb)
-
-
-if __name__ == '__main__':
-    async def prep():
-        await bot.wait_until_ready()
-        # Load Cogs in list
-        for cog in available_cogs:
-            bot.load_extension(cog)
-
-    # Run Bot
-    bot.loop.create_task(prep())
-    bot.run(os.getenv("DISCORD_TOKEN"))
+import os
+import traceback
+
+import discord
+from discord.ext import commands
+
+from dotenv import load_dotenv
+
+from embed import default_embed
+
+load_dotenv()
+
+# A list containing all cogs that we want to load
+available_cogs = ['cogs.maintenance', 'cogs.logging', 'cogs.utility', 'cogs.channels', 'cogs.moderation',
+                  'cogs.tagging']
+
+# Disabled Cogs
+# 'cogs.verification'
+
+# Bot Init
+description = "Roblox API Server Documentation Bot"
+intent = discord.Intents.default()
+intent.members = True
+bot = commands.Bot(command_prefix='?', description=description, help_command=None)
+
+
+# Client Login
+@bot.event
+async def on_ready():
+    print(f"Logged in as {bot.user.name}, id: {bot.user.id}")
+    print("--")
+
+
+# Event Error. the args are required
+@bot.event
+async def on_error(event, *args, **kwargs):
+    channel = bot.get_channel(int(os.getenv('ERROR_LOGS_CHANNEL')))
+    emb = default_embed('Error (Event)', color=discord.Color.red())
+    emb.add_field(name="Event", value=event, inline=False)
+    emb.add_field(name="Traceback", value=traceback.format_exc(), inline=False)
+    await channel.send(embed=emb)
+
+
+# Command Error
+@bot.event
+async def on_command_error(ctx, error):
+    channel = bot.get_channel(int(os.getenv('ERROR_LOGS_CHANNEL')))
+    emb = default_embed('Error (Commands)', color=discord.Color.red())
+    emb.add_field(name="Error", value=error, inline=False)
+    emb.add_field(name="Command", value=ctx.command, inline=False)
+    emb.add_field(name="Message", value=ctx.message.content, inline=False)
+    await channel.send(embed=emb)
+
+
+if __name__ == '__main__':
+    async def prep():
+        await bot.wait_until_ready()
+        # Load Cogs in list
+        for cog in available_cogs:
+            bot.load_extension(cog)
+
+    # Run Bot
+    bot.loop.create_task(prep())
+    bot.run(os.getenv("DISCORD_TOKEN"))