mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-18 23:15:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix Client.fetch_guilds not working correctly, increase default limit

Browse Source
This commit is contained in:
Lilly Rose Berner 2022-04-23 04:31:33 +02:00 committed by GitHub
parent efe24c3927
commit 08844985cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
discord/client.py
View File

@ -1194,7 +1194,7 @@ class Client:
async def fetch_guilds( async def fetch_guilds(
self, self,
*, *,
limit: Optional[int] = 100, limit: Optional[int] = 200,
before: Optional[SnowflakeTime] = None, before: Optional[SnowflakeTime] = None,
after: Optional[SnowflakeTime] = None, after: Optional[SnowflakeTime] = None,
) -> AsyncIterator[Guild]: ) -> AsyncIterator[Guild]:
@ -1230,7 +1230,12 @@ class Client:
The number of guilds to retrieve. The number of guilds to retrieve.
If ``None``, it retrieves every guild you have access to. Note, however, If ``None``, it retrieves every guild you have access to. Note, however,
that this would make it a slow operation. that this would make it a slow operation.
Defaults to ``100``. Defaults to ``200``.
.. versionchanged:: 2.0
The default has been changed to 200.
before: Union[:class:`.abc.Snowflake`, :class:`datetime.datetime`] before: Union[:class:`.abc.Snowflake`, :class:`datetime.datetime`]
Retrieves guilds before this date or object. Retrieves guilds before this date or object.
If a datetime is provided, it is recommended to use a UTC aware datetime. If a datetime is provided, it is recommended to use a UTC aware datetime.
@ -1259,7 +1264,7 @@ class Client:
if limit is not None: if limit is not None:
limit -= len(data) limit -= len(data)
before = Object(id=int(data[-1]['id'])) before = Object(id=int(data[0]['id']))
return data, before, limit return data, before, limit
@ -1271,7 +1276,7 @@ class Client:
if limit is not None: if limit is not None:
limit -= len(data) limit -= len(data)
after = Object(id=int(data[0]['id'])) after = Object(id=int(data[-1]['id']))
return data, after, limit return data, after, limit
@ -1281,22 +1286,23 @@ class Client:
after = Object(id=time_snowflake(after, high=True)) after = Object(id=time_snowflake(after, high=True))
predicate: Optional[Callable[[GuildPayload], bool]] = None predicate: Optional[Callable[[GuildPayload], bool]] = None
strategy, state = _before_strategy, before strategy, state = _after_strategy, after
if before:
strategy, state = _before_strategy, before
if before and after: if before and after:
predicate = lambda m: int(m['id']) > after.id predicate = lambda m: int(m['id']) > after.id
elif after:
strategy, state = _after_strategy, after
while True: while True:
retrieve = min(100 if limit is None else limit, 100) retrieve = min(200 if limit is None else limit, 200)
if retrieve < 1: if retrieve < 1:
return return
data, state, limit = await strategy(retrieve, state, limit) data, state, limit = await strategy(retrieve, state, limit)
# Terminate loop on next iteration; there's no data left after this # Terminate loop on next iteration; there's no data left after this
if len(data) < 100: if len(data) < 200:
limit = 0 limit = 0
if predicate: if predicate: