mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-07-25 12:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix audit log pagination logic

Browse Source
This commit is contained in:
Josh 2023-02-27 21:15:28 +10:00 committed by GitHub
parent 90d50bef1f
commit 6af6f82411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
discord/guild.py
View File

@ -3630,7 +3630,7 @@ class Guild(Hashable):
if limit is not None: if limit is not None:
limit -= len(entries) limit -= len(entries)
after = Object(id=int(entries[0]['id'])) after = Object(id=int(entries[-1]['id']))
return data, entries, after, limit return data, entries, after, limit
@ -3647,20 +3647,19 @@ class Guild(Hashable):
if isinstance(after, datetime.datetime): if isinstance(after, datetime.datetime):
after = Object(id=utils.time_snowflake(after, high=True)) after = Object(id=utils.time_snowflake(after, high=True))
if oldest_first is MISSING: if oldest_first:
reverse = after is not MISSING if after is MISSING:
else: after = OLDEST_OBJECT
reverse = oldest_first
predicate = None predicate = None
if reverse: if oldest_first:
strategy, state = _after_strategy, after strategy, state = _after_strategy, after
if before: if before:
predicate = lambda m: int(m['id']) < before.id predicate = lambda m: int(m['id']) < before.id
else: else:
strategy, state = _before_strategy, before strategy, state = _before_strategy, before
if after and after != OLDEST_OBJECT: if after:
predicate = lambda m: int(m['id']) > after.id predicate = lambda m: int(m['id']) > after.id
# avoid circular import # avoid circular import
@ -3673,8 +3672,6 @@ class Guild(Hashable):
data, raw_entries, state, limit = await strategy(retrieve, state, limit) data, raw_entries, state, limit = await strategy(retrieve, state, limit)
if reverse:
raw_entries = reversed(raw_entries)
if predicate: if predicate:
raw_entries = filter(predicate, raw_entries) raw_entries = filter(predicate, raw_entries)

2
discord/http.py
View File

@ -1717,7 +1717,7 @@ class HTTPClient:
params: Dict[str, Any] = {'limit': limit} params: Dict[str, Any] = {'limit': limit}
if before: if before:
params['before'] = before params['before'] = before
if after: if after is not None:
params['after'] = after params['after'] = after
if user_id: if user_id:
params['user_id'] = user_id params['user_id'] = user_id