Organized database tables to prevent table spam and added back username in osu command

Signed-off-by: ColaIan <colaian.yt@gmail.com>

Author: ColaIan

Teapot.py

@@ -16,7 +16,7 @@
    |_|\\___|\\__,_| .__/ \\___/ \\__|
     by ColaIan |_| & RedTea
 
-Running Teapot.pt {teapot.version()}
+Running Teapot.py {teapot.version()}
 """)
 
 load_dotenv(join(dirname(__file__), '.env'))
@@ -36,11 +36,11 @@
     db.execute('CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT)')
     db.execute('CREATE TABLE IF NOT EXISTS `channels` (`channel_id` BIGINT, `channel_name` TINYTEXT)')
     db.execute("CREATE TABLE IF NOT EXISTS `users` (`user_id` BIGINT, `user_name` TINYTEXT, `user_discriminator` INT)")
-    db.execute("CREATE TABLE IF NOT EXISTS `logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` "
+    db.execute("CREATE TABLE IF NOT EXISTS `bot_logs` (`timestamp` TEXT, `type` TINYTEXT, `class` TINYTEXT, `message` "
                "MEDIUMTEXT)")
     print(f"Connected to database ({teapot.config.db_host()}) in {round(time.perf_counter() - time_start, 2)}s")
 
-    db.execute("INSERT INTO `logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
+    db.execute("INSERT INTO `bot_logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
                (teapot.time(), "BOT_START", __name__, "Initialized bot"))
     database.commit()
 
@@ -61,8 +61,8 @@ async def on_ready():
     if teapot.config.storage_type() == "mysql":
         for guild in bot.guilds:
             teapot.managers.database.create_guild_table(guild)
-    elif teapot.config.storage_type() == "flatfile":
-        print("[!] Flatfile storage has not been implemented yet. MySQL database is recommended")
+    elif teapot.config.storage_type() == "sqlite":
+        print("[!] SQLite storage has not been implemented yet. MySQL database is recommended")
     print(f"Registered commands and events in {round(time.perf_counter() - time_start, 2)}s")
     await bot.change_presence(status=discord.Status.online, activity=discord.Game(teapot.config.bot_status()))
 
@@ -74,5 +74,5 @@ async def on_ready():
 except Exception as e:
     print(f"[/!\\] Failed to connect to DiscordAPI. Please check your bot token!\n{e}")
     if teapot.config.storage_type() == "mysql":
-        db.execute("INSERT INTO `logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
+        db.execute("INSERT INTO `bot_logs`(timestamp, type, class, message) VALUES(%s, %s, %s, %s)",
                    (teapot.time(), "ERROR", __name__, e))

teapot/cogs/osu.py

@@ -11,6 +11,7 @@ class OsuPlayer:
     def __init__(self, player):
         self.id = player["user_id"]
         self.username = player["username"]
+        self.join_date = (player["join_date"].split(" "))[0]
         self.c300 = player["count300"]
         self.c100 = player["count100"]
         self.c50 = player["count50"]
@@ -28,20 +29,19 @@ def __init__(self, player):
         self.pp_country_rank = player["pp_country_rank"]
 
     def display(self, author):
-        title = self.username
-        desc = self.country.upper()
-        url = 'https://osu.ppy.sh/u/' + self.username
         em = dmbd.newembed()
+        em.set_author(name=f"{self.country.upper()} | {self.username}", url=f"https://osu.ppy.sh/u/{self.username}")
         em.add_field(name='Performance', value=self.pp_raw + 'pp')
         em.add_field(name='Accuracy', value="{0:.2f}%".format(float(self.accuracy)))
         lvl = int(float(self.level))
         percent = int((float(self.level) - lvl) * 100)
-        em.add_field(name='Level', value="{0} ({1}%)".format(lvl, percent))
+        em.add_field(name='Level', value=f"{lvl} ({percent}%)")
         em.add_field(name='Rank', value=self.pp)
         em.add_field(name='Country Rank', value=self.pp_country_rank)
         em.add_field(name='Playcount', value=self.playcount)
         em.add_field(name='Total Score', value=self.total)
         em.add_field(name='Ranked Score', value=self.ranked)
+        em.add_field(name='Registered At', value=self.join_date)
         return em
 
 
@@ -53,12 +53,7 @@ def __init__(self, bot):
     async def osu(self, ctx, *, args: str):
         """
         Look up an osu player:
-        Usage: osu [UserID/Username] [Optional:Mode(default Osu!)]
-        Modes:
-            0 - Default Osu!
-            1 - Taiko
-            2 - ChitogeBot
-            3 - Osu!mania
+        Usage: osu [UserID/Username]
         """
 
         args_array = args.split(' ')
@@ -69,20 +64,16 @@ async def osu(self, ctx, *, args: str):
             peppy = args_array[0]
             type = "0"
         else:
-            await ctx.send('Wrong Syntax!')
+            await ctx.send('Invalid Syntax!')
             return
         cookiezi = '05b43eb66b2977d4f2c9148b00e3853688d515cf'
-        link = ('http://osu.ppy.sh/api/get_user?k=' + cookiezi + '&u=' + peppy
-                + '&m=' + type)
-        r = requests.get(link)
+        r = requests.get('http://osu.ppy.sh/api/get_user?k=' + cookiezi + '&u=' + peppy + '&m=' + type)
 
         if r.status_code != 200:
             print('Unable to fetch osu statistics!')
             return
-        brainpower = json.loads(r.text)
 
-        hvick = OsuPlayer(brainpower[0])
-        await ctx.send(embed=hvick.display(ctx.message.author))
+        await ctx.send(embed=OsuPlayer(json.loads(r.text)[0]).display(ctx.message.author))
 
 
 def setup(bot):

teapot/events.py

@@ -21,9 +21,9 @@ async def on_member_join(member):
             try:
                 database = teapot.database.__init__()
                 db = teapot.database.db(database)
-                db.execute("INSERT INTO " + str(
-                    member.guild.id) + "_logs" + "(timestamp, guild_id, channel_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s)",
-                           (teapot.time(), member.guild.id, member.channel.id, member.id, "MEMBER_JOIN"))
+                db.execute(
+                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s)",
+                    (teapot.time(), member.guild.id, member.channel.id, member.id, "MEMBER_JOIN"))
                 database.commit()
             except Exception as e:
                 print(e)
@@ -36,9 +36,9 @@ async def on_member_remove(member):
             try:
                 database = teapot.database.__init__()
                 db = teapot.database.db(database)
-                db.execute("INSERT INTO " + str(
-                    member.guild.id) + "_logs" + "(timestamp, guild_id, channel_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s)",
-                           (teapot.time(), member.guild.id, member.channel.id, member.id, "MEMBER_REMOVE"))
+                db.execute(
+                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s)",
+                    (teapot.time(), member.guild.id, member.channel.id, member.id, "MEMBER_REMOVE"))
                 database.commit()
             except Exception as e:
                 print(e)
@@ -70,10 +70,10 @@ async def on_message(message):
                     db.execute("INSERT INTO `channels`(channel_id, channel_name) VALUES(%s, %s)",
                                (message.channel.id, message.channel.name))
                     database.commit()
-                db.execute("INSERT INTO `" + str(
-                    guild.id) + "_logs" + "`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
-                           (teapot.time(), message.guild.id, message.channel.id, message.id, message.author.id,
-                            "MESSAGE_SEND", message.content))
+                db.execute(
+                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
+                    (teapot.time(), message.guild.id, message.channel.id, message.id, message.author.id,
+                     "MESSAGE_SEND", message.content))
                 database.commit()
             except Exception as e:
                 print(e)
@@ -93,28 +93,24 @@ async def on_raw_message_edit(ctx):
                 try:
                     database = teapot.database.__init__()
                     db = teapot.database.db(database)
-                    db.execute("INSERT INTO " + str(
-                        guild_id) + "_logs" + "(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
-                               (teapot.time(), guild_id, channel_id, message_id, author_id, "MESSAGE_EDIT", content))
+                    db.execute(
+                        "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
+                        (teapot.time(), guild_id, channel_id, message_id, author_id, "MESSAGE_EDIT", content))
                     database.commit()
                 except Exception as e:
                     print(e)
-            elif teapot.config.storage_type() == "flatfile":
-                pass
         except:
             content = str(json.loads(json.dumps(ctx.data))['embeds'])
             if teapot.config.storage_type() == "mysql":
                 try:
                     database = teapot.database.__init__()
                     db = teapot.database.db(database)
-                    db.execute("INSERT INTO " + str(
-                        guild_id) + "_logs" + "(timestamp, guild_id, channel_id, message_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s)",
-                               (teapot.time(), guild_id, channel_id, message_id, "MESSAGE_EDIT", content))
+                    db.execute(
+                        "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s)",
+                        (teapot.time(), guild_id, channel_id, message_id, "MESSAGE_EDIT", content))
                     database.commit()
                 except Exception as e:
                     print(e)
-            elif teapot.config.storage_type() == "flatfile":
-                pass
 
 
 def message_delete(bot):
@@ -124,14 +120,12 @@ async def on_message_delete(ctx):
             try:
                 database = teapot.database.__init__()
                 db = teapot.database.db(database)
-                db.execute("INSERT INTO " + str(
-                    ctx.guild.id) + "_logs" + "(timestamp, guild_id, channel_id, message_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s, %s)",
-                           (teapot.time(), ctx.guild.id, ctx.channel.id, ctx.id, ctx.author.id, "MESSAGE_DELETE"))
+                db.execute(
+                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type) VALUES(%s, %s, %s, %s, %s, %s)",
+                    (teapot.time(), ctx.guild.id, ctx.channel.id, ctx.id, ctx.author.id, "MESSAGE_DELETE"))
                 database.commit()
             except Exception as e:
                 print(e)
-        elif teapot.config.storage_type() == "flatfile":
-            pass
 
 
 def on_command_error(bot):
@@ -141,10 +135,10 @@ async def on_command_error(ctx, error):
             try:
                 database = teapot.database.__init__()
                 db = teapot.database.db(database)
-                db.execute("INSERT INTO " + str(
-                    ctx.guild.id) + "_logs" + "(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
-                           (teapot.time(), ctx.guild.id, ctx.message.channel.id, ctx.message.id, ctx.message.author.id,
-                            "CMD_ERROR", str(error)))
+                db.execute(
+                    "INSERT INTO `guild_logs`(timestamp, guild_id, channel_id, message_id, user_id, action_type, message) VALUES(%s, %s, %s, %s, %s, %s, %s)",
+                    (teapot.time(), ctx.guild.id, ctx.message.channel.id, ctx.message.id, ctx.message.author.id,
+                     "CMD_ERROR", str(error)))
                 database.commit()
             except Exception as e:
                 print(e)

teapot/managers/database.py

@@ -44,14 +44,43 @@ def db(database):
         quit()
 
 
+def create_table(stmt):
+    database = teapot.managers.database.__init__()
+    db = teapot.managers.database.db(database)
+
+    db.execute(stmt)
+    db.close()
+    del db
+
+
+def insert(stmt, var):
+    database = teapot.managers.database.__init__()
+    db = teapot.managers.database.db(database)
+
+    db.execute(stmt, var)
+    database.commit()
+
+    db.close()
+    del db
+
+
+def insert_if_not_exists(stmt):
+    database = teapot.managers.database.__init__()
+    db = teapot.managers.database.db(database)
+
+    db.execute(stmt)
+    database.commit()
+
+    db.close()
+    del db
+
+
 def create_guild_table(guild):
     database = teapot.managers.database.__init__()
     db = teapot.managers.database.db(database)
 
     db.execute("SELECT * FROM `guilds` WHERE guild_id = '" + str(guild.id) + "'")
     if db.rowcount == 0:
-        db.execute("INSERT INTO `guilds`(guild_id, guild_name) VALUES(%s, %s)", (guild.id, guild.name))
-        database.commit()
-    db.execute("CREATE TABLE IF NOT EXISTS `" + str(
-        guild.id) + "_logs" + "` (`timestamp` TEXT, `guild_id` BIGINT, `channel_id` BIGINT, `message_id` "
-                              "BIGINT, `user_id` BIGINT, `action_type` TINYTEXT, `message` MEDIUMTEXT)")
+        insert("INSERT INTO `guilds`(guild_id, guild_name) VALUES(%s, %s)", (guild.id, guild.name))
+    create_table("CREATE TABLE IF NOT EXISTS `guild_logs` (`timestamp` TEXT, `guild_id` BIGINT, `channel_id` BIGINT, "
+                 "`message_id` BIGINT, `user_id` BIGINT, `action_type` TINYTEXT, `message` MEDIUMTEXT)")