Merge pull request #49 from stijndcl/mod_contributors

Replace isMe with isOwner to allow other people to debug their own bot

cogs/train.py

@@ -89,7 +89,7 @@ class Train(commands.Cog):
         return "".join(arr)
 
     async def sendEmbed(self, ctx, embed):
-        if checks.allowedChannels(ctx):
+        if await checks.allowedChannels(ctx):
             await ctx.send(embed=embed)
         else:
             await ctx.author.send(embed=embed)

functions/checks.py

@@ -8,22 +8,23 @@ import requests
 from functions.database import currency
 
 
-# Checks if caller of a command is me
+# Checks if caller of a command is the owner of the bot
-def isMe(ctx):
+async def isMe(ctx):
-    return str(ctx.author.id) == constants.myId
+    # return str(ctx.author.id) == constants.myId
+    return await ctx.bot.is_owner(ctx.author)
 
 
 # Checks if the caller of a command is an admin
-def isMod(ctx):
+async def isMod(ctx):
     if ctx.guild is None:
-        return isMe(ctx)
+        return await isMe(ctx)
 
     return ctx.author.id in constants.mods[ctx.guild.id]
 
 
 # Checks if a command is allowed to be used in this channel
-def allowedChannels(ctx):
+async def allowedChannels(ctx):
-    return isMe(ctx) or ctx.channel.type == discord.ChannelType.private or int(ctx.channel.id) in constants.allowedChannels.values()
+    return (await isMe(ctx)) or ctx.channel.type == discord.ChannelType.private or int(ctx.channel.id) in constants.allowedChannels.values()
 
 
 # TODO find a better way to check for legit links because reddit posts return a 502