code cleanup

Author: DevER-M

general.py commands/general.pygeneral.py renamed to commands/general.py

@@ -1,6 +1,6 @@
 import os,sys,discord,asyncio
 import base64 as b64
-sys.path.insert(1, 'modules/')
+sys.path.insert(1, '../modules')
 
 import possiblekeywords
 from googlesearch import search
@@ -120,7 +120,25 @@ async def meme_(self,ctx):
                 await button_ctx.edit_origin(embed=func.meme())
             except asyncio.exceptions.TimeoutError:
                 break
-
+    
+    @commands.command(name="gs")
+    async def gs(self, ctx, *, query):
+        await ctx.author.send(f"Here are the links related to your question!")
+        for j in search(query, safe='on', start=1, stop=1):
+            await ctx.author.send(f"\n:point_right: {j}")
+            await ctx.author.send("Have any more questions:question:\nFeel free to ask again :smiley: !")
+    
+    @commands.command(name="servers")
+    async def servers(self, ctx):
+        await ctx.send(
+            embed=discord.Embed(description=f"`i am in {len(self.bot.guilds)} guilds`",
+                            color=discord.Color.green()))
+
+    @commands.command(name="servname")
+    async def servname(self,ctx):
+        names = []
+        for guild in self.bot.guilds:names.append(f"**`{guild.name}`**")
+        await ctx.send(embed=discord.Embed(description=f"\n".join(names),color=discord.Color.green()))
 
 
 def setup(bot):

music.py commands/music.pymusic.py renamed to commands/music.py

@@ -7,7 +7,7 @@
 import sys
 import traceback
 
-sys.path.insert(1,'./modules')
+sys.path.insert(1,'../modules')
 
 import json
 import impfunctions as func

slashcog.py commands/slashcog.pyslashcog.py renamed to commands/slashcog.py

@@ -2,12 +2,12 @@
 import sys
 import base64 as b64
 
-sys.path.insert(1, './modules')
+sys.path.insert(1, '../modules')
 
 import time
 import math
 import discord
-import keep_alive
+import modules.keep_alive as keep_alive
 
 import asyncio
 #import youtube_dl

main.py

@@ -3,27 +3,24 @@
 sys.path.insert(1, './modules')
 
 import discord
-import keep_alive
+import modules.keep_alive as keep_alive
 from googlesearch import search
 from discord.ext import commands
 from discord_slash import SlashCommand
 
 
 
 bot = commands.Bot(command_prefix='.', help_command=None)
-
 slash = SlashCommand(bot,
                      sync_commands=True,
                      sync_on_cog_reload=True,
                      application_id=916685474364534805)
-
 beats_activity = [discord.ActivityType.listening, "Beats"]
-
-extensions = ["music", "general"]
-bot.load_extension("music")
-bot.load_extension("general")
-bot.load_extension("slashcog")
-
+cogs = [
+    'general',
+    'music',
+    'slashcog'
+]
 
 
 @bot.event
@@ -34,37 +31,8 @@ async def on_ready():
         type=beats_activity[0], name=beats_activity[1]),
                               status=discord.Status.dnd)
 
-
-
-
-
-@bot.command()
-async def gs(ctx,*, query):
-    await ctx.author.send(f"Here are the links related to your question!")
-    for j in search(query, safe='on', start=1, stop=1):
-        await ctx.author.send(f"\n:point_right: {j}")
-        await ctx.author.send("Have any more questions:question:\nFeel free to ask again :smiley: !")
-
-
-@bot.command()
-async def servers(ctx):
-    await ctx.send(
-        embed=discord.Embed(description=f"`i am in {len(bot.guilds)} guilds`",
-                            color=discord.Color.green()))
-
-
-@bot.command()
-async def rawserv(ctx):
-    await ctx.send(bot.guilds)
-
-@bot.command()
-async def servname(ctx):
-    names = []
-    for guild in bot.guilds:names.append(f"**`{guild.name}`**")
-    await ctx.send(embed=discord.Embed(description=f"\n".join(names),color=discord.Color.green()))
-
-
-
+for file in cogs:
+    bot.load_extension(f'commands.{file}')
 
 
 TOKEN = str(os.getenv('TOKEN'))