Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: TypeError when ScheduledEvent.subscribers limit is None #2407

Merged
merged 4 commits into from Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -30,6 +30,8 @@ These changes are available on the `master` branch, but have not yet been releas
([#2402](https://github.com/Pycord-Development/pycord/pull/2402))
- Fixed the type-hinting of `ScheduledEvent.subscribers` to reflect actual behavior.
([#2400](https://github.com/Pycord-Development/pycord/pull/2400))
- Fixed `ScheduledEvent.subscribers` behavior with `limit=None`.
([#2407](https://github.com/Pycord-Development/pycord/pull/2407))

### Changed

Expand Down
10 changes: 8 additions & 2 deletions discord/iterators.py
Expand Up @@ -919,8 +919,14 @@ async def fill_subs(self):
before=before,
after=after,
)
if data:
self.limit -= self.retrieve

data_length = len(data)
if data_length < self.retrieve:
self.limit = 0
yoggys marked this conversation as resolved.
Show resolved Hide resolved
elif data_length > 0:
if self.limit:
self.limit -= self.retrieve
self.after = Object(id=int(data[-1]["user_id"]))

for element in reversed(data):
if "member" in element:
Expand Down
1 change: 1 addition & 0 deletions discord/types/scheduled_events.py
Expand Up @@ -60,5 +60,6 @@ class ScheduledEventEntityMetadata(TypedDict):

class ScheduledEventSubscriber(TypedDict):
guild_scheduled_event_id: Snowflake
user_id: Snowflake
user: User
member: Member | None