Coding cleaning and weird bug

cogs/Admin.py

     def __init__(self, Bot):
         self.bot = Bot
         self.con = Config(Bot)
+        self.serverconfig = self.con.serverconfig
 
     @bot.command(pass_context=True, hidden=True)
     async def blacklist(self, ctx, option, *args):
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            if setting in self.con.serverconfig[ctx.message.server.id]:
-                self.con.serverconfig = self.con.load_config()
-                if not self.con.serverconfig[ctx.message.server.id][setting]["enabled"]:
-                    self.con.serverconfig[ctx.message.server.id][setting]["enabled"] = 1
-                    self.con.updateconfig()
+            server_id = ctx.message.server.id
+            if setting in self.serverconfig[server_id]:
+                self.serverconfig = self.con.load_config()
+                if not self.serverconfig[server_id][setting]["enabled"]:
+                    self.serverconfig[server_id][setting]["enabled"] = 1
+                    self.con.updateconfig(self.serverconfig)
                     return await self.bot.say("'{}' was enabled!".format(setting))
                 else:
-                    self.con.serverconfig[ctx.message.server.id][setting]["enabled"] = 0
-                    self.con.updateconfig()
+                    self.serverconfig[server_id][setting]["enabled"] = 0
+                    self.con.updateconfig(self.serverconfig)
                     return await self.bot.say("'{}' was disabled :cry:".format(setting))
             else:
                 return await self.bot.say("That module dont exist fam. You made the thing")
 
+    # TODO: Combine all set commands into one
+
     @bot.command(pass_context=True, hidden=True)
     async def set_welcomechannel(self, ctx, channel: discord.Channel = None):
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            self.con.serverconfig = self.con.load_config()
-            self.con.serverconfig[ctx.message.server.id]["greets"]["welcome-channel"] = channel.id
-            self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            self.serverconfig[ctx.message.server.id]["greets"]["welcome-channel"] = channel.id
+            self.con.updateconfig(self.serverconfig)
         return await self.bot.say("{} has been set as the welcome channel!".format(channel.mention))
 
     @bot.command(pass_context=True, hidden=True)
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            self.con.serverconfig = self.con.load_config()
-            self.con.serverconfig[ctx.message.server.id]["goodbyes"]["goodbye-channel"] = channel.id
-            self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            self.serverconfig[ctx.message.server.id]["goodbyes"]["goodbye-channel"] = channel.id
+            self.con.updateconfig(self.serverconfig)
         return await self.bot.say("{} has been set as the goodbye channel!".format(channel.mention))
 
     @bot.command(pass_context=True, hidden=True)
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            self.con.serverconfig = self.con.load_config()
-            self.con.serverconfig[ctx.message.server.id]["twitch"]["twitch-channel"] = channel.id
-            self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            self.serverconfig[ctx.message.server.id]["twitch"]["twitch-channel"] = channel.id
+            self.con.updateconfig(self.serverconfig)
         return await self.bot.say("{} has been set as the twitch shilling channel!".format(channel.mention))
 
     @bot.command(pass_context=True, hidden=True)
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            self.con.serverconfig = self.con.load_config()
-            self.con.serverconfig[ctx.message.server.id]["greets"]["custom-message"] = message
-            self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            self.serverconfig[ctx.message.server.id]["greets"]["custom-message"] = message
+            self.con.updateconfig(self.serverconfig)
         return await self.bot.say("Custom message set to '{}'".format(message))
 
     @bot.command(pass_context=True, hidden=True, aliases=["setava"])

cogs/Twitch.py

     def __init__(self, bot):
         self.bot = bot
         self.con = Config(bot)
+        self.serverconfig = self.con.serverconfig
 
     async def on_member_update(self, member_b, member_a):
         # Twitch Shilling Part
             return
         if member_a.game:
             if member_a.game.type and not member_b.game.type:
-                ts_enabled = self.con.serverconfig[member_a.server.id]["twitch"]["enabled"]
-                ts_whitelist = self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["enabled"]
+                ts_enabled = self.serverconfig[member_a.server.id]["twitch"]["enabled"]
+                ts_whitelist = self.serverconfig[member_a.server.id]["twitch"]["whitelist"]["enabled"]
                 if ts_enabled:
                     if not ts_whitelist or member_a.id in \
-                            self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["list"]:
-                        channel = discord.Object(self.con.serverconfig[member_a.server.id]["twitch"]["twitch-channel"])
+                            self.serverconfig[member_a.server.id]["twitch"]["whitelist"]["list"]:
+                        channel = discord.Object(self.serverconfig[member_a.server.id]["twitch"]["twitch-channel"])
                         return await self.bot.send_message(channel,
                                                            content=":video_game:** {} is live!** :video_game:\n{}\n{}".format(
                                                                member_a.name, member_a.game.name, member_a.game.url))
         if not owner(ctx):
             return await self.bot.reply("You do not have permission to do this command.", delete_after=20)
         else:
-            self.con.serverconfig = self.con.load_config()
-            if not self.con.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"]:
-                self.con.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"] = 1
-                self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            if not self.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"]:
+                self.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"] = 1
+                self.con.updateconfig(self.serverconfig)
                 return await self.bot.reply("Whitelist for Twitch shilling has been enabled.")
             else:
-                self.con.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"] = 0
-                self.con.updateconfig()
+                self.serverconfig[ctx.server.id]["twitch"]["whitelist"]["enabled"] = 0
+                self.con.updateconfig(self.serverconfig)
                 return await self.bot.reply("Whitelist for Twitch shilling has been disabled.")
 
     @bot.command(pass_context=True, hidden=True)
             return await self.bot.say('Invalid option "%s" specified, use +, -, add, or remove' % option, expire_in=20)
 
         if option in ['+', 'add']:
-            self.con.serverconfig = self.con.load_config()
+            self.serverconfig = self.con.load_config()
             for user in ctx.message.mentions:
-                self.con.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"].append(user.id)
-                self.con.updateconfig()
+                self.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"].append(user.id)
+                self.con.updateconfig(self.serverconfig)
                 whitelist_count += 1
             return await self.bot.say('{} user(s) have been added to the whitelist'.format(whitelist_count))
 
         elif option in ['-', 'remove']:
-            self.con.serverconfig = self.con.load_config()
+            self.serverconfig = self.con.load_config()
             for user in ctx.message.mentions:
-                if user.id in self.con.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"]:
-                    self.con.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"].remove(user.id)
-                    self.con.updateconfig()
+                if user.id in self.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"]:
+                    self.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"].remove(user.id)
+                    self.con.updateconfig(self.serverconfig)
                     whitelist_count += 1
             return await self.bot.say('{} user(s) have been removed to the whitelist'.format(whitelist_count))
 
         elif option == 'list':
             return await self.bot.say(
-                self.con.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"])
+                self.serverconfig[ctx.message.server.id]["twitch"]["whitelist"]["list"])
 
 
 def setup(bot):

cogs/__init__.py

-import json
 cogs = [
     'cogs.Admin',
     'cogs.Twitch',
     'cogs.selfAssign',
-    'cogs.Fun'
+    'cogs.Fun',
+    'cogs.joinLeave',
+    'config.config'
 ]

cogs/joinLeave.py

+import discord
+
+from config.config import Config
+
+class joinLeave():
+    def __init__(self, Bot):
+        self.bot = Bot
+        self.con = Config(Bot)
+
+    async def on_member_join(self, member):
+        """
+        Greets users when they join a server. 
+        """
+        # TODO: Move these to a cog cause they suck in main
+        self.con.load_config()
+        if not self.con.serverconfig[member.server.id]["greets"]["enabled"]:
+            return
+        if self.con.serverconfig[member.server.id]["greets"]["custom-message"]:
+            message = self.con.serverconfig[member.server.id]["greets"]["custom-message"]
+        else:
+            message = self.con.serverconfig[member.server.id]["greets"]["default-message"]
+        # TODO: Maybe thumbnail for the embed
+        em = discord.Embed(
+            title="Welcome to {}!".format(member.server),
+            description='Hey {}! Welcome to **{}**! {}'.format(member.mention, member.server, message),
+            colour=0xDEADBF)
+
+        if self.con.serverconfig[member.server.id]["greets"]["welcome-channel"]:
+            channel = discord.Object(self.con.serverconfig[member.server.id]["greets"]["welcome-channel"])
+        else:
+            channel = member.server.default_channel
+        return await self.bot.send_message(channel,embed=em)
+
+    async def on_member_remove(self, member):
+        self.con.load_config()
+        if not self.con.serverconfig[member.server.id]["goodbyes"]["enabled"]:
+            return
+        else:
+            return await self.bot.send_message(member.server,embed=discord.Embed(
+                description="{}#{} has left or been beaned.".format(member.name, member.discriminator), colour=0xDEADBF))
+
+def setup(Bot):
+    Bot.add_cog(joinLeave(Bot))

cogs/selfAssign.py

     def __init__(self, Bot):
         self.bot = Bot
         self.con = Config(Bot)
+        self.serverconfig = self.con.serverconfig
 
     @bot.command(pass_context=True)
     async def listroles(self, ctx):
             {command_prefix}listroles
         """
         roles = []
-        for role in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+        for role in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
             for serverrole in ctx.message.server.roles:
                 if role == serverrole.id:
                     roles.append(serverrole.name)
         return await self.bot.say(str(roles).strip("[]"))
 
-
     @bot.command(pass_context=True)
     async def iam(self, ctx, role: discord.Role = None):
         """
         Example:
             .iam OverwatchPing
         """
-        self.con.serverconfig = self.con.load_config()
-        if not self.con.serverconfig[ctx.message.server.id]["selfAssign"]["enabled"]:
+        self.serverconfig = self.con.load_config()
+        if not self.serverconfig[ctx.message.server.id]["selfAssign"]["enabled"]:
             return
 
         user = ctx.message.author
         if role in user.roles:
             return await self.bot.say("You already have that role.")
 
-        if role.id in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+        if role.id in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
             await self.bot.add_roles(user, role)
             print("{} added {} to themselves in {} on {}".format(user.display_name, role.name, ctx.message.channel,
                                                                  ctx.message.server))
         Example:
             .iamn OverwatchPing
         """
-        self.con.serverconfig = self.con.load_config()
-        if not self.con.serverconfig[ctx.message.server.id]["selfAssign"]["enabled"]:
+        self.serverconfig = self.con.load_config()
+        if not self.serverconfig[ctx.message.server.id]["selfAssign"]["enabled"]:
             return
 
         user = ctx.message.author
         if role not in server.roles:
             return await self.bot.say("That role doesn't exist. Roles are case sensitive. ")
 
-        elif role in user.roles and role.id in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+        elif role in user.roles and role.id in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
             await self.bot.remove_roles(user, role)
             return await self.bot.reply("{} has been successfully removed.".format(role.name))
 
-        elif role not in user.roles and role.id in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+        elif role not in user.roles and role.id in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
             return await self.bot.reply("You do not have {}.".format(role.name))
         else:
             return await self.bot.say("That role is not self-assignable.")
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            if role.id in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+            if role.id in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
                 return await self.bot.say("{} is already a self-assignable role.".format(role.name), delete_after=self.con.delete_after)
-            self.con.serverconfig = self.con.load_config()
-            self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"].append(role.id)
-            self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"].append(role.id)
+            self.con.updateconfig(self.serverconfig)
             return await self.bot.say('Role "{}" added'.format(str(role)))
 
     @bot.command(pass_context=True, hidden=True)
         if not owner(ctx):
             return await self.bot.reply(self.con.no_perms_reponse, delete_after=self.con.delete_after)
         else:
-            self.con.serverconfig = self.con.load_config()
-            if role.id in self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
-                self.con.serverconfig[ctx.message.server.id]["selfAssign"]["roles"].remove(role.id)
-                self.con.updateconfig()
+            self.serverconfig = self.con.load_config()
+            if role.id in self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"]:
+                self.serverconfig[ctx.message.server.id]["selfAssign"]["roles"].remove(role.id)
+                self.con.updateconfig(self.serverconfig)
                 return await self.bot.say('"{}" has been removed from the self-assignable roles.'.format(str(role)))
             else:
                 return await self.bot.say("That role was not in the list.")

config/config.py

 
     async def on_server_join(self, server):
         self.serverconfig[server.id] = self.serverconfig_template["example"]
-        self.updateconfig()
+        self.updateconfig(self.serverconfig)
 
     async def on_server_remove(self, server):
         self.serverconfig.pop(server.id)
-        self.updateconfig()
+        self.updateconfig(self.serverconfig)
 
     def load_config(self):
         with open('config/config.json', 'r') as config_file:
             return json.load(config_file)
 
-    def updateconfig(self):
+    def updateconfig(self, config):
         with open('config/config.json', 'w') as conf_file:
-            json.dump(self.serverconfig, conf_file)
+            json.dump(config, conf_file)
 
     def config_errorcheck(self):
         # TODO: Fix so that it checks for problems in children of module settings. i.e children of 'greets'
         for server in self.bot.servers:
             if server.id not in self.serverconfig:
                 self.serverconfig[server.id] = self.serverconfig_template["example"]
-                self.updateconfig()
+                self.updateconfig(self.serverconfig)
                 print(
                     "WARNING: The config file for {} was not found. A template has been loaded and saved. All modules are turned off by default.".format(
                         server.name.upper()))
                     if module_setting not in self.serverconfig[server.id]:
                         self.serverconfig[server.id][module_setting] = self.serverconfig_template["example"][
                             module_setting]
-                        self.updateconfig()
+                        self.updateconfig(self.serverconfig)
                         print(
                             "WARNING: The config file for {} was missing the {} module. This has been fixed with the template version. It is disabled by default.".format(
                                 server.name.upper(), module_setting.upper()))

main.py

         return await bot.process_commands(message)
 
 
-@bot.event
-async def on_member_join(member):
-    """
-    Greets users when they join a server. 
-    """
-    # TODO: Move these to a cog cause they suck in main
-    con.load_config()
-    if not con.serverconfig[member.server.id]["greets"]["enabled"]:
-        return
-    if con.serverconfig[member.server.id]["greets"]["custom-message"]:
-        message = con.serverconfig[member.server.id]["greets"]["custom-message"]
-    else:
-        message = con.serverconfig[member.server.id]["greets"]["default-message"]
-    # TODO: Maybe thumbnail for the embed
-    em = discord.Embed(
-        title="Welcome to {}!".format(member.server),
-        description='Hey {}! Welcome to **{}**! {}'.format(member.mention, member.server, message),
-        colour=0xDEADBF)
-
-    if con.serverconfig[member.server.id]["greets"]["welcome-channel"]:
-        channel = discord.Object(con.serverconfig[member.server.id]["greets"]["welcome-channel"])
-    else:
-        channel = member.server.default_channel
-    return await bot.send_message(channel,embed=em)
-
-
-@bot.event
-async def on_member_remove(member):
-    con.load_config()
-    if not con.serverconfig[member.server.id]["goodbyes"]["enabled"]:
-        return
-    else:
-        return await bot.send_message(member.server,embed=discord.Embed(
-            description="{}#{} has left or been beaned.".format(member.name, member.discriminator), colour=0xDEADBF))
-
-
 if __name__ == "__main__":
     bot.run(token)