Skip to content

Commit 548ca85

Browse files
authored
fix: TypeError when ScheduledEvent.subscribers limit is None (Pycord-Development#2407)
1 parent a29bc14 commit 548ca85

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ These changes are available on the `master` branch, but have not yet been releas
3030
([#2402](https://github.com/Pycord-Development/pycord/pull/2402))
3131
- Fixed the type-hinting of `ScheduledEvent.subscribers` to reflect actual behavior.
3232
([#2400](https://github.com/Pycord-Development/pycord/pull/2400))
33+
- Fixed `ScheduledEvent.subscribers` behavior with `limit=None`.
34+
([#2407](https://github.com/Pycord-Development/pycord/pull/2407))
3335

3436
### Changed
3537

discord/iterators.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -919,8 +919,14 @@ async def fill_subs(self):
919919
before=before,
920920
after=after,
921921
)
922-
if data:
923-
self.limit -= self.retrieve
922+
923+
data_length = len(data)
924+
if data_length < self.retrieve:
925+
self.limit = 0
926+
elif data_length > 0:
927+
if self.limit:
928+
self.limit -= self.retrieve
929+
self.after = Object(id=int(data[-1]["user_id"]))
924930

925931
for element in reversed(data):
926932
if "member" in element:

discord/types/scheduled_events.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@ class ScheduledEventEntityMetadata(TypedDict):
6060

6161
class ScheduledEventSubscriber(TypedDict):
6262
guild_scheduled_event_id: Snowflake
63+
user_id: Snowflake
6364
user: User
6465
member: Member | None

0 commit comments

Comments
 (0)