Refactor customcommands

Utility.py

@@ -2484,37 +2484,6 @@ async def update_welcome_message(self, server_id, message):
         await self.conn.execute("UPDATE general.welcome SET message = $1 WHERE serverid = $2", message, server_id)
         self.cache.welcome_messages[server_id]['message'] = message
 
-    ########################
-    # ## CUSTOM COMMANDS## #
-    ########################
-
-    async def check_custom_command_name_exists(self, server_id, command_name):
-        if server_id:
-            custom_commands = self.cache.custom_commands.get(server_id)
-            if custom_commands:
-                if command_name.lower() in custom_commands:
-                    return True
-        return False
-
-    async def add_custom_command(self, server_id, command_name, message):
-        await self.conn.execute("INSERT INTO general.customcommands(serverid, commandname, message) VALUES ($1, $2, $3)", server_id, command_name, message)
-        custom_commands = self.cache.custom_commands.get(server_id)
-        if custom_commands:
-            custom_commands[command_name] = message
-        else:
-            self.cache.custom_commands[server_id] = {command_name: message}
-
-    async def remove_custom_command(self, server_id, command_name):
-        await self.conn.execute("DELETE FROM general.customcommands WHERE serverid = $1 AND commandname = $2", server_id, command_name)
-        custom_commands = self.cache.custom_commands.get(server_id)
-        try:
-            custom_commands.pop(command_name)
-        except Exception as e:
-            log.console(e)
-
-    async def get_custom_command(self, server_id, command_name):
-        commands = self.cache.custom_commands.get(server_id)
-        return commands.get(command_name)
     ###################
     # ## BIAS GAME ## #
     ###################

module/CustomCommands.py

@@ -13,8 +13,8 @@ async def process_custom_commands(message):
                 current_message_prefix = message.content[0:len(keys.bot_prefix)]
                 if current_message_prefix == keys.bot_prefix:
                     message_without_prefix = message.content[len(keys.bot_prefix):len(message.content)].lower()
-                    if await ex.check_custom_command_name_exists(guild_id, message_without_prefix):
-                        await message.channel.send(await ex.get_custom_command(guild_id, message_without_prefix))
+                    if await ex.u_custom_commands.check_custom_command_name_exists(guild_id, message_without_prefix):
+                        await message.channel.send(await ex.u_custom_commands.get_custom_command(guild_id, message_without_prefix))
 
     @commands.command(aliases=['addcommand'])
     @commands.has_guild_permissions(manage_messages=True)
@@ -25,10 +25,10 @@ async def createcommand(self, ctx, command_name, *, message):
             msg_is_cmd = await ex.check_message_is_command(command_name, is_command_name=True)
             if msg_is_cmd:
                 return await ctx.send(f"> {command_name} is already a bot command and can not be added.")
-            if await ex.check_custom_command_name_exists(ctx.guild.id, command_name):
+            if await ex.u_custom_commands.check_custom_command_name_exists(ctx.guild.id, command_name):
                 return await ctx.send(f"> {command_name} is already a custom command and can not be added.")
             else:
-                await ex.add_custom_command(ctx.guild.id, command_name, message)
+                await ex.u_custom_commands.add_custom_command(ctx.guild.id, command_name, message)
                 return await ctx.send(f"> {command_name} has been added as a command.")
         except Exception as e:
             await ctx.send(f"> An unexpected error occurred -> {e}. Please {await ex.get_server_prefix_by_context(ctx)}report it.")
@@ -39,7 +39,7 @@ async def createcommand(self, ctx, command_name, *, message):
     async def deletecommand(self, ctx, command_name):
         """Delete a custom command. [Format: %deletecommand (command name)]"""
         try:
-            await ex.remove_custom_command(ctx.guild.id, command_name.lower())
+            await ex.u_custom_commands.remove_custom_command(ctx.guild.id, command_name.lower())
             return await ctx.send(f"> If the `{command_name}` exists, it was removed.")
         except Exception as e:
             await ctx.send(f"> An unexpected error occurred -> {e}. Please {await ex.get_server_prefix_by_context(ctx)}report it.")

util/customcommands.py

@@ -2,5 +2,30 @@
 
 
 class CustomCommands(Utility):
-    pass
+    async def check_custom_command_name_exists(self, server_id, command_name):
+        if server_id:
+            custom_commands = self.cache.custom_commands.get(server_id)
+            if custom_commands:
+                if command_name.lower() in custom_commands:
+                    return True
+        return False
 
+    async def add_custom_command(self, server_id, command_name, message):
+        await self.conn.execute("INSERT INTO general.customcommands(serverid, commandname, message) VALUES ($1, $2, $3)", server_id, command_name, message)
+        custom_commands = self.cache.custom_commands.get(server_id)
+        if custom_commands:
+            custom_commands[command_name] = message
+        else:
+            self.cache.custom_commands[server_id] = {command_name: message}
+
+    async def remove_custom_command(self, server_id, command_name):
+        await self.conn.execute("DELETE FROM general.customcommands WHERE serverid = $1 AND commandname = $2", server_id, command_name)
+        custom_commands = self.cache.custom_commands.get(server_id)
+        try:
+            custom_commands.pop(command_name)
+        except Exception as e:
+            log.console(e)
+
+    async def get_custom_command(self, server_id, command_name):
+        commands = self.cache.custom_commands.get(server_id)
+        return commands.get(command_name)