Quick and dirty fix for !cleanup

This commit is contained in:
Twentysix 2016-05-01 01:09:00 +02:00
parent 4eccdcdcd6
commit b7a2ded43b

View File

@ -6,6 +6,7 @@ from __main__ import send_cmd_help, settings
import os import os
import logging import logging
import json import json
import asyncio
class Mod: class Mod:
"""Moderation tools.""" """Moderation tools."""
@ -126,14 +127,17 @@ class Mod:
async for x in self.bot.logs_from(message.channel, limit=100, before=message): async for x in self.bot.logs_from(message.channel, limit=100, before=message):
if number == 0: if number == 0:
await self.bot.delete_message(cmdmsg) await self.bot.delete_message(cmdmsg)
await asyncio.sleep(0.25)
return return
if text in x.content: if text in x.content:
await self.bot.delete_message(x) await self.bot.delete_message(x)
await asyncio.sleep(0.25)
number -= 1 number -= 1
new = True new = True
message = x message = x
if not new or number == 0: if not new or number == 0:
await self.bot.delete_message(cmdmsg) await self.bot.delete_message(cmdmsg)
await asyncio.sleep(0.25)
break break
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")
@ -156,14 +160,17 @@ class Mod:
async for x in self.bot.logs_from(message.channel, limit=100, before=message): async for x in self.bot.logs_from(message.channel, limit=100, before=message):
if number == 0: if number == 0:
await self.bot.delete_message(cmdmsg) await self.bot.delete_message(cmdmsg)
await asyncio.sleep(0.25)
return return
if x.author.id == user.id: if x.author.id == user.id:
await self.bot.delete_message(x) await self.bot.delete_message(x)
await asyncio.sleep(0.25)
number -= 1 number -= 1
new = True new = True
message = x message = x
if not new or number == 0: if not new or number == 0:
await self.bot.delete_message(cmdmsg) await self.bot.delete_message(cmdmsg)
await asyncio.sleep(0.25)
break break
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")
@ -181,6 +188,7 @@ class Mod:
if number > 0 and number < 10000: if number > 0 and number < 10000:
async for x in self.bot.logs_from(channel, limit=number+1): async for x in self.bot.logs_from(channel, limit=number+1):
await self.bot.delete_message(x) await self.bot.delete_message(x)
await asyncio.sleep(0.25)
except discord.errors.Forbidden: except discord.errors.Forbidden:
await self.bot.say("I need permissions to manage messages in this channel.") await self.bot.say("I need permissions to manage messages in this channel.")