1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-12-25 06:37:29 +00:00

Merge branch 'master' into dev

This commit is contained in:
Dylan Dizon 2018-11-08 22:33:00 -05:00
commit 80f5c080f7

View file

@ -1490,7 +1490,7 @@ class MsG:
await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60) await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60)
except exc.Remove: except exc.Remove:
await message.edit(content=f'Type the tag(s) to remove or `0` to cancel:') await message.edit(content=f'Type the tag(s) to remove or `0` to continue:')
try: try:
while not self.bot.is_closed(): while not self.bot.is_closed():
@ -1507,9 +1507,7 @@ class MsG:
pass pass
await message.edit(content=f'Confirm or deny changes') await message.edit(content=f'Confirm or deny changes')
await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60)
while not self.bot.is_closed:
await self.bot.wait_for('reaction_add', check=on_reaction, timeout=8 * 60)
self.aliases.update(aliases) self.aliases.update(aliases)
u.dump(self.aliases, 'cogs/aliases.pkl') u.dump(self.aliases, 'cogs/aliases.pkl')
@ -1526,9 +1524,10 @@ class MsG:
finally: finally:
if messages: if messages:
for msg in messages: with suppress(err.NotFound):
await msg.delete() for msg in messages:
await message.delete() await msg.delete()
await message.delete()
@_add_tags.command(name='global', aliases=['gl', 'g']) @_add_tags.command(name='global', aliases=['gl', 'g'])
@cmds.is_owner() @cmds.is_owner()