mirror of
https://github.com/Rapptz/discord.py.git
synced 2025-07-22 19:06:44 +00:00
Fix audit log pagination logic
This commit is contained in:
parent
90d50bef1f
commit
6af6f82411
@ -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)
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user