CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-06-27 02:31:04 +12:00
Code Issues Releases Wiki Activity

Added a check in case a message is not found when trying to delete; added a check to ensure the provided permission is valid

Browse source
This commit is contained in:
Phxntxm 2016-09-17 20:30:20 -05:00
parent 85103727d6
commit 5ebab3a077
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cogs/mod.py
View file

@ -165,6 +165,11 @@ class Mod:
if permissions.lower() == "none":
permissions = "send_messages"
# Check if the permission that was requested is valid
if getattr(discord.Permissions, permissions, None) is None:
await self.bot.say("{} does not appear to be a valid permission! Valid permissions are: ```\n{}```"
.format(permissions, "\n".join(valid_perms)))
return
# Convert the string to an int value of the permissions object, based on the required permission
perm_obj = discord.Permissions.none()
setattr(perm_obj, permissions, True)
@ -203,11 +208,6 @@ class Mod:
await self.bot.say("This command cannot have custom permissions setup!")
return
if getattr(discord.Permissions, permissions, None) is None:
await self.bot.say("{} does not appear to be a valid permission! Valid permissions are: ```\n{}```"
.format(permissions, "\n".join(valid_perms)))
return
custom_perms = await config.get_content('custom_permissions')
server_perms = custom_perms.get(ctx.message.server.id) or {}
# Save the qualified name, so that we don't get screwed up by aliases
@ -299,8 +299,11 @@ class Mod:
count = 0
async for msg in self.bot.logs_from(ctx.message.channel):
if msg.author in members:
await self.bot.delete_message(msg)
count += 1
try:
await self.bot.delete_message(msg)
count += 1
except discord.NotFound:
pass
if count >= limit:
break
msg = await self.bot.say("{} messages succesfully deleted".format(count))