aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-05-10 19:39:58 -0400
committerRapptz <[email protected]>2016-05-10 19:39:58 -0400
commit1e175f2ab3cb38c094b2eca8f9214d076b211c4b (patch)
treef67d6a5902477d3cb85570b5ab4f3171b1610fa0
parentAdd Client.purge_from as a high level interface around bulk delete. (diff)
downloaddiscord.py-1e175f2ab3cb38c094b2eca8f9214d076b211c4b.tar.xz
discord.py-1e175f2ab3cb38c094b2eca8f9214d076b211c4b.zip
Fix issue with Client.purge_from not deleting the 101st message.
-rw-r--r--discord/client.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/discord/client.py b/discord/client.py
index 7c8915f1..5dcdb4b6 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -1039,7 +1039,7 @@ class Client:
The number of messages to search through. This is not the number
of messages that will be deleted, though it can be.
check : predicate
- The function used to check if a function should be deleted.
+ The function used to check if a message should be deleted.
It must take a :class:`Message` as its sole parameter.
before : :class:`Message`
The message before scanning for purging must be.
@@ -1075,7 +1075,6 @@ class Client:
# more than 2 messages -> bulk delete
to_delete = ret[-count:]
yield from self.delete_messages(to_delete)
- yield from asyncio.sleep(1)
elif count == 1:
# delete a single message
yield from self.delete_message(ret[-1])
@@ -1088,11 +1087,10 @@ class Client:
yield from self.delete_messages(to_delete)
count = 0
yield from asyncio.sleep(1)
- else:
- # queue isn't full so just add it in there
- if check(msg):
- count += 1
- ret.append(msg)
+
+ if check(msg):
+ count += 1
+ ret.append(msg)
@asyncio.coroutine
def edit_message(self, message, new_content):