CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-02 18:54:33 +12:00
Code Issues Releases Wiki Activity

Changed checks to the custom predicate for custom permissions

Browse source
This commit is contained in:
phxntxm 2016-07-15 17:46:10 -05:00
parent 727f7107f2
commit 46db1a28c2
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cogs/core.py
View file

@ -157,7 +157,7 @@ class Core:
config.closeConnection()
@tag.command(name='delete', aliases=['remove', 'stop'], pass_context=True)
@commands.has_permissions(kick_members=True)
@checks.customPermsOrRole("kick_members")
async def del_tag(self, ctx, *tag: str):
"""Use this to remove a tag that from use for this server
Format to delete a tag is !tag delete <tag>"""
@ -174,10 +174,6 @@ class Core:
await self.bot.say('I have just removed the tag `{}`'.format(tag))
config.closeConnection()
@commands.command()
async def test(self, *first: str, second: str):
await self.bot.say("First: {}\nSecond: {}".format(first, second))
def setup(bot):
bot.add_cog(Core(bot))

12
cogs/mod.py
View file

@ -25,7 +25,7 @@ class Mod:
await self.bot.say('Invalid subcommand passed: {0.subcommand_passed}'.format(ctx))
@nsfw.command(name="add", pass_context=True)
@commands.has_permissions(kick_members=True)
@checks.customPermsOrRole("kick_members")
async def nsfw_add(self, ctx):
"""Registers this channel as a 'nsfw' channel"""
cursor = config.getCursor()
@ -40,7 +40,7 @@ class Mod:
await self.bot.say("This channel has just been registered as 'nsfw'! Have fun you naughties ;)")
@nsfw.command(name="remove", aliases=["delete"], pass_context=True)
@commands.has_permissions(kick_members=True)
@checks.customPermsOrRole("kick_members")
async def nsfw_remove(self, ctx):
"""Removes this channel as a 'nsfw' channel"""
cursor = config.getCursor()
@ -56,14 +56,14 @@ class Mod:
await self.bot.say("This channel has just been unregistered as a nsfw channel")
@commands.command(pass_context=True, no_pm=True)
@commands.has_permissions(manage_server=True)
@checks.customPermsOrRole("manage_server")
async def leave(self, ctx):
"""Forces the bot to leave the server"""
await self.bot.say('Why must I leave? Hopefully I can come back :c')
await self.bot.leave_server(ctx.message.server)
@commands.command(pass_context=True)
@commands.has_permissions(kick_members=True)
@checks.customPermsOrRole("kick_members")
async def say(self, ctx, *msg: str):
"""Tells the bot to repeat what you say"""
msg = ' '.join(msg)
@ -96,7 +96,7 @@ class Mod:
command))
@perms.command(name="add", aliases=["setup,create"], pass_context=True)
@commands.has_permissions(manage_server=True)
@checks.customPermsOrRole("manage_server")
async def add_perms(self, ctx, *msg: str):
command = " ".join(msg[0:len(msg)-1])
permissions = msg[len(msg)-1]
@ -109,7 +109,7 @@ class Mod:
cmd = cmd.commands.get(msg[count])
except:
break
for check in cmd.checks:
if "isOwner" == check.__name__:
await self.bot.say("This command cannot have custom permissions setup!")