matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Fall back to single message delete in Messageable.purge

Browse Source 
Also make it work on user accounts.

Fixes #456.
This commit is contained in:
Rapptz 2017-02-23 00:23:40 -05:00
parent 2fe5da836c
commit 0e8b260d45
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
discord/abc.py
View File

@ -27,6 +27,7 @@ DEALINGS IN THE SOFTWARE.
import abc import abc
import io import io
import os import os
import time
import asyncio import asyncio
from collections import namedtuple from collections import namedtuple
@ -45,6 +46,11 @@ class _Undefined:
_undefined = _Undefined() _undefined = _Undefined()
@asyncio.coroutine
def _single_delete_strategy(messages):
for m in messages:
yield from m.delete()
class Snowflake(metaclass=abc.ABCMeta): class Snowflake(metaclass=abc.ABCMeta):
__slots__ = () __slots__ = ()
@ -819,12 +825,14 @@ class Messageable(metaclass=abc.ABCMeta):
``check``. If a ``check`` is not provided then all messages are deleted ``check``. If a ``check`` is not provided then all messages are deleted
without discrimination. without discrimination.
You must have :attr:`Permissions.manage_messages` permission to You must have :attr:`Permissions.manage_messages` permission to delete
delete messages even if they are your own. The messages even if they are your own (unless you are a user account).
:attr:`Permissions.read_message_history` permission is also needed to The :attr:`Permissions.read_message_history` permission is also needed
retrieve message history. to retrieve message history.
Usable only by bot accounts. Internally, this employs a different number of strategies depending
on the conditions met such as if a bulk delete is possible or if
the account is a user bot or not.
Parameters Parameters
----------- -----------
@ -844,8 +852,7 @@ class Messageable(metaclass=abc.ABCMeta):
Raises Raises
------- -------
Forbidden Forbidden
You do not have proper permissions to do the actions required or You do not have proper permissions to do the actions required.
you're not using a bot account.
HTTPException HTTPException
Purging the messages failed. Purging the messages failed.
@ -873,6 +880,9 @@ class Messageable(metaclass=abc.ABCMeta):
ret = [] ret = []
count = 0 count = 0
minimum_time = int((time.time() - 14 * 24 * 60 * 60) * 1000.0 - 1420070400000) << 22
strategy = self.delete_messages if self._state.is_bot else _single_delete_strategy
while True: while True:
try: try:
msg = yield from iterator.get() msg = yield from iterator.get()
@ -881,7 +891,7 @@ class Messageable(metaclass=abc.ABCMeta):
if count >= 2: if count >= 2:
# more than 2 messages -> bulk delete # more than 2 messages -> bulk delete
to_delete = ret[-count:] to_delete = ret[-count:]
yield from self.delete_messages(to_delete) yield from strategy(to_delete)
elif count == 1: elif count == 1:
# delete a single message # delete a single message
yield from ret[-1].delete() yield from ret[-1].delete()
@ -891,10 +901,21 @@ class Messageable(metaclass=abc.ABCMeta):
if count == 100: if count == 100:
# we've reached a full 'queue' # we've reached a full 'queue'
to_delete = ret[-100:] to_delete = ret[-100:]
yield from self.delete_messages(to_delete) yield from strategy(to_delete)
count = 0 count = 0
yield from asyncio.sleep(1) yield from asyncio.sleep(1)
if check(msg): if check(msg):
if msg.id < minimum_time:
# older than 14 days old
if count == 1:
yield from ret[-1].delete()
elif count >= 2:
to_delete = ret[-count:]
yield from strategy(to_delete)
count = 0
strategy = _single_delete_strategy
count += 1 count += 1
ret.append(msg) ret.append(msg)