From 98f67ba49f2dc256919fedaa32ebf93b12c3cd3a Mon Sep 17 00:00:00 2001
From: YoggieS <61660055+yoggys@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:06:36 +0100
Subject: [PATCH 1/3] fix: TypeError when limit is None

---
 discord/iterators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/discord/iterators.py b/discord/iterators.py
index de442aa0fb..e4e5d16ce6 100644
--- a/discord/iterators.py
+++ b/discord/iterators.py
@@ -919,7 +919,7 @@ async def fill_subs(self):
             before=before,
             after=after,
         )
-        if data:
+        if data and self.limit:
             self.limit -= self.retrieve
 
         for element in reversed(data):

From 9fd6de922b31aed12916eaeed5ea1ec3bcad2636 Mon Sep 17 00:00:00 2001
From: YoggieS <61660055+yoggys@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:37:11 +0100
Subject: [PATCH 2/3] fix: TypeError when limit is None & proper after update

---
 discord/iterators.py              | 10 ++++++++--
 discord/types/scheduled_events.py |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/discord/iterators.py b/discord/iterators.py
index e4e5d16ce6..1e403d69fe 100644
--- a/discord/iterators.py
+++ b/discord/iterators.py
@@ -919,8 +919,14 @@ async def fill_subs(self):
             before=before,
             after=after,
         )
-        if data and self.limit:
-            self.limit -= self.retrieve
+
+        data_length = len(data)
+        if data_length < self.retrieve:
+            self.limit = 0
+        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:
diff --git a/discord/types/scheduled_events.py b/discord/types/scheduled_events.py
index 85d77d7313..9bb4ad0328 100644
--- a/discord/types/scheduled_events.py
+++ b/discord/types/scheduled_events.py
@@ -60,5 +60,6 @@ class ScheduledEventEntityMetadata(TypedDict):
 
 class ScheduledEventSubscriber(TypedDict):
     guild_scheduled_event_id: Snowflake
+    user_id: Snowflake
     user: User
     member: Member | None

From 5bae75f27968fd726e8b7756bc73b126bc6938e8 Mon Sep 17 00:00:00 2001
From: YoggieS <61660055+yoggys@users.noreply.github.com>
Date: Thu, 21 Mar 2024 21:39:56 +0100
Subject: [PATCH 3/3] update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3f5595f10..0ed201ff5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2392](https://github.com/Pycord-Development/pycord/pull/2392))
 - Fixed `Paginator.edit` to no longer set user to the bot.
   ([#2390](https://github.com/Pycord-Development/pycord/pull/2390))
+- Fixed `ScheduledEvent.subscribers` behaviour with `limit=None`.
+  ([#2407](https://github.com/Pycord-Development/pycord/pull/2407))
 
 ### Changed