From 6e032984c6e7b55f50013ef60a01c9c2e92135a2 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/4] 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 ef7ef9be85..1612070b1c 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 1a6f5a7197c486036594fb202aa2e88796701fd7 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/4] 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 1612070b1c..1537dc8605 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 a51324a10113108128189843acfa4eb2ae673aec 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/4] conflicts v2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd19979e74..9213577fa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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` behaviour with `limit=None`.
+  ([#2407](https://github.com/Pycord-Development/pycord/pull/2407))
 
 ### Changed
 

From 08b4d226da186f0c64981b95e41e0b8fc8c45027 Mon Sep 17 00:00:00 2001
From: YoggieS <61660055+yoggys@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:33:45 +0100
Subject: [PATCH 4/4] update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9213577fa2..bbf54d9c22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,7 @@ 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` behaviour with `limit=None`.
+- Fixed `ScheduledEvent.subscribers` behavior with `limit=None`.
   ([#2407](https://github.com/Pycord-Development/pycord/pull/2407))
 
 ### Changed