Cleaning file structure

Author: AlexFlipnote

data.py

@@ -1,47 +1,17 @@
 import os
-import discord
 
-from discord.ext.commands import DefaultHelpCommand
-from data import Bot
-from utils import permissions, default
+from utils import default
+from utils.data import Bot, HelpFormat
 
 config = default.get("config.json")
-
-
-class HelpFormat(DefaultHelpCommand):
-    def get_destination(self, no_pm: bool = False):
-        if no_pm:
-            return self.context.channel
-        else:
-            return self.context.author
-
-    async def send_error_message(self, error):
-        destination = self.get_destination(no_pm=True)
-        await destination.send(error)
-
-    async def send_command_help(self, command):
-        self.add_command_formatting(command)
-        self.paginator.close_page()
-        await self.send_pages(no_pm=True)
-
-    async def send_pages(self, no_pm: bool = False):
-        try:
-            if permissions.can_react(self.context):
-                await self.context.message.add_reaction(chr(0x2709))
-        except discord.Forbidden:
-            pass
-
-        try:
-            destination = self.get_destination(no_pm=no_pm)
-            for page in self.paginator.pages:
-                await destination.send(page)
-        except discord.Forbidden:
-            destination = self.get_destination(no_pm=True)
-            await destination.send("Couldn't send help to you due to blocked DMs...")
-
-
 print("Logging in...")
-bot = Bot(command_prefix=config.prefix, prefix=config.prefix, command_attrs=dict(hidden=True), help_command=HelpFormat())
+
+bot = Bot(
+    command_prefix=config.prefix,
+    prefix=config.prefix,
+    command_attrs=dict(hidden=True),
+    help_command=HelpFormat()
+)
 
 for file in os.listdir("cogs"):
     if file.endswith(".py"):

index.py

@@ -0,0 +1,47 @@
+import discord
+
+from utils import permissions
+from discord.ext.commands import AutoShardedBot, DefaultHelpCommand
+
+
+class Bot(AutoShardedBot):
+    def __init__(self, *args, prefix=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    async def on_message(self, msg):
+        if not self.is_ready() or msg.author.bot or not permissions.can_send(msg):
+            return
+
+        await self.process_commands(msg)
+
+
+class HelpFormat(DefaultHelpCommand):
+    def get_destination(self, no_pm: bool = False):
+        if no_pm:
+            return self.context.channel
+        else:
+            return self.context.author
+
+    async def send_error_message(self, error):
+        destination = self.get_destination(no_pm=True)
+        await destination.send(error)
+
+    async def send_command_help(self, command):
+        self.add_command_formatting(command)
+        self.paginator.close_page()
+        await self.send_pages(no_pm=True)
+
+    async def send_pages(self, no_pm: bool = False):
+        try:
+            if permissions.can_react(self.context):
+                await self.context.message.add_reaction(chr(0x2709))
+        except discord.Forbidden:
+            pass
+
+        try:
+            destination = self.get_destination(no_pm=no_pm)
+            for page in self.paginator.pages:
+                await destination.send(page)
+        except discord.Forbidden:
+            destination = self.get_destination(no_pm=True)
+            await destination.send("Couldn't send help to you due to blocked DMs...")

utils/data.py

@@ -1,7 +1,7 @@
 import json
 
 
-def change_value(file, value, changeto):
+def change_value(file: str, value: str, changeto: str):
     try:
         with open(file, "r") as jsonFile:
             data = json.load(jsonFile)
@@ -13,7 +13,7 @@ def change_value(file, value, changeto):
         json.dump(data, jsonFile, indent=2)
 
 
-def append_value(file, value, addition):
+def append_value(file: str, value: str, addition: str):
     try:
         with open(file, "r") as jsonFile:
             data = json.load(jsonFile)