Various bug fixes (twitch shilling, config issues with greets and goodbyes. naming issue in admin.py) some small changes to ux and some extra todos.

cogs/Admin.py

@@ -119,7 +119,7 @@ class Admin():
             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_shilling"]["twitch-channel"] = channel.id
+            self.con.serverconfig[ctx.message.server.id]["twitch"]["twitch-channel"] = channel.id
             self.con.updateconfig()
         return await self.bot.say("{} has been set as the twitch shilling channel!".format(channel.mention))
 

cogs/Twitch.py

@@ -14,15 +14,14 @@ class Twitch():
         # Twitch Shilling Part
         if blacklisted(member_b):
             return
-        ts_enabled = self.con.serverconfig[member_a.server.id]["twitch"]["enabled"]
-        if ts_enabled:
-            if not self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"][
-                "enabled"] or member_a.id in \
-                    self.con.serverconfig[member_a.server.id]["twitch"]["whitelist"]["list"]:
-                if member_a.game:
-                    if member_a.game.type:
-                        channel = discord.Object(
-                            self.con.serverconfig[member_a.server.id]["twitch"]["twitch-channel"])
+        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"]
+                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"])
                         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))

cogs/selfAssign.py

@@ -26,7 +26,8 @@ class selfAssign():
             for serverrole in ctx.message.server.roles:
                 if role == serverrole.id:
                     roles.append(serverrole.name)
-        return await self.bot.say(roles)
+        return await self.bot.say(str(roles).strip("[]'"))
+
 
     @bot.command(pass_context=True)
     async def iam(self, ctx, role: discord.Role = None):

config/config.json

@@ -1 +1 @@
-{"175285455204384768": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "304048071963312130": {"greets": {"enabled": 1, "welcome-channel": "304048071963312130", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 1, "roles": ["307330606348632064", "308082456743903233", "308083509866659850"]}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "325593726384734210": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}}
+{"175285455204384768": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}, "304048071963312130": {"greets": {"enabled": 1, "welcome-channel": "304048071963312130", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 1, "roles": ["307330606348632064", "308082456743903233", "308083509866659850"]}, "twitch": {"enabled": 1, "twitch-channel": "304048071963312130", "whitelist": {"enabled": 0, "list": []}}}, "325593726384734210": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message:": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "selfAssign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}}}

config/config.py

@@ -3,6 +3,7 @@ import json
 
 class Config():
     def __init__(self, bot):
+        # TODO: Move default message into settings.ini
         self.serverconfig_template = {
             "example": {
                 "greets": {

main.py

@@ -35,7 +35,7 @@ async def on_ready():
     con.config_errorcheck()
     print("Discord.py version: "+discord.__version__)
     print("Client logged in\n")
-    await bot.change_presence(game=discord.Game(name=__version__), afk=False)
+    await bot.change_presence(game=discord.Game(name="v"+__version__), afk=False)
     print("Cods loaded:")
     for cog in cogs:
         bot.load_extension(cog)
@@ -59,11 +59,9 @@ async def on_message(message):
 async def on_member_join(member):
     """
     Greets users when they join a server. 
-    
-    :param member: 
-    :return: 
     """
-    print(con.serverconfig[member.server.id]["greets"]["enabled"])
+    # 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"]:
@@ -85,6 +83,7 @@ async def on_member_join(member):
 
 @bot.event
 async def on_member_remove(member):
+    con.load_config()
     if not con.serverconfig[member.server.id]["goodbyes"]["enabled"]:
         return
     else: