fix: GuildSchedule not being cached correctly + missing fields

CHANGELOG.md

@@ -12,6 +12,12 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Added
 
+- Added `ScheduledEventEntityType` enum and `ScheduledEventEntityMetadata` class, added
+  missing attributes and API-aligned parameters to `ScheduledEvent`,
+  `Guild.create_scheduled_event`, and `ScheduledEvent.edit`, and added `use_cache` to
+  `ScheduledEvent.subscribers()`.
+  ([#3025](https://github.com/Pycord-Development/pycord/pull/3025))
+
 ### Changed
 
 ### Fixed
@@ -22,9 +28,15 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#3231](https://github.com/Pycord-Development/pycord/pull/3231))
 - Allow `ForumTag` to be created without an emoji.
   ([#3245](https://github.com/Pycord-Development/pycord/pull/3245))
+- Fixed `ScheduledEvent` subscriber cache not being kept in sync correctly.
+  ([#3025](https://github.com/Pycord-Development/pycord/pull/3025))
 
 ### Deprecated
 
+- Deprecated `ScheduledEventLocationType`, `ScheduledEventLocation`, and several
+  `ScheduledEvent` attributes and related methods' parameters in favor of their
+  API-aligned names. ([#3025](https://github.com/Pycord-Development/pycord/pull/3025))
+
 ### Removed
 
 ## [2.8.0] - 2026-05-18

discord/audit_logs.py

@@ -277,10 +277,7 @@ class AuditLogChanges:
         "format_type": (None, _enum_transformer(enums.StickerFormatType)),
         "type": (None, _transform_type),
         "status": (None, _enum_transformer(enums.ScheduledEventStatus)),
-        "entity_type": (
-            "location_type",
-            _enum_transformer(enums.ScheduledEventLocationType),
-        ),
+        "entity_type": (None, _enum_transformer(enums.ScheduledEventEntityType)),
         "command_id": ("command_id", _transform_snowflake),
         "image_hash": ("image", _transform_scheduled_event_image),
         "trigger_type": (None, _enum_transformer(enums.AutoModTriggerType)),
@@ -318,7 +315,11 @@ def __init__(
                 "$add_allow_list",
             ]:
                 self._handle_trigger_metadata(
-                    self.before, self.after, entry, elem["new_value"], attr  # type: ignore
+                    self.before,
+                    self.after,
+                    entry,
+                    elem["new_value"],
+                    attr,  # type: ignore
                 )
                 continue
             elif attr in [
@@ -327,7 +328,11 @@ def __init__(
                 "$remove_allow_list",
             ]:
                 self._handle_trigger_metadata(
-                    self.after, self.before, entry, elem["new_value"], attr  # type: ignore
+                    self.after,
+                    self.before,
+                    entry,
+                    elem["new_value"],
+                    attr,  # type: ignore
                 )
                 continue
 
@@ -349,21 +354,6 @@ def __init__(
                 if transformer:
                     before = transformer(entry, before)
 
-            if attr == "location" and hasattr(self.before, "location_type"):
-                from .scheduled_events import ScheduledEventLocation
-
-                if (
-                    self.before.location_type
-                    is enums.ScheduledEventLocationType.external
-                ):
-                    before = ScheduledEventLocation(state=state, value=before)
-                elif hasattr(self.before, "channel"):
-                    before = ScheduledEventLocation(
-                        state=state, value=self.before.channel
-                    )
-
-            setattr(self.before, attr, before)
-
             try:
                 after = elem["new_value"]
             except KeyError:
@@ -372,22 +362,34 @@ def __init__(
                 if transformer:
                     after = transformer(entry, after)
 
-            if attr == "location" and hasattr(self.after, "location_type"):
-                from .scheduled_events import ScheduledEventLocation
-
-                if (
-                    self.after.location_type
-                    is enums.ScheduledEventLocationType.external
-                ):
-                    after = ScheduledEventLocation(state=state, value=after)
-                elif hasattr(self.after, "channel"):
-                    after = ScheduledEventLocation(
-                        state=state, value=self.after.channel
-                    )
-
+            setattr(self.before, attr, before)
             setattr(self.after, attr, after)
+            if attr == "location":
+                from .scheduled_events import ScheduledEventEntityMetadata
+
+                setattr(
+                    self.after,
+                    "entity_metadata",
+                    (
+                        ScheduledEventEntityMetadata(location=after)
+                        if after is not None
+                        else None
+                    ),
+                )
+                setattr(
+                    self.before,
+                    "entity_metadata",
+                    (
+                        ScheduledEventEntityMetadata(location=before)
+                        if before is not None
+                        else None
+                    ),
+                )
 
         # add an alias
+        if hasattr(self.after, "entity_type"):
+            self.after.location_type = self.after.entity_type
+            self.before.location_type = self.before.entity_type
         if hasattr(self.after, "colour"):
             self.after.color = self.after.colour
             self.before.color = self.before.colour
@@ -691,7 +693,12 @@ def _convert_target_invite(self, target_id: int) -> Invite:
             "uses": changeset.uses,
         }
 
-        obj = Invite(state=self._state, data=fake_payload, guild=self.guild, channel=changeset.channel)  # type: ignore
+        obj = Invite(
+            state=self._state,
+            data=fake_payload,
+            guild=self.guild,
+            channel=changeset.channel,
+        )  # type: ignore
         try:
             obj.inviter = changeset.inviter
         except AttributeError:

discord/enums.py

@@ -30,6 +30,8 @@
 from enum import IntEnum
 from typing import TYPE_CHECKING, Any, ClassVar, TypeVar, Union
 
+from typing_extensions import deprecated
+
 __all__ = (
     "Enum",
     "ChannelType",
@@ -62,6 +64,7 @@
     "EmbeddedActivity",
     "ScheduledEventStatus",
     "ScheduledEventPrivacyLevel",
+    "ScheduledEventEntityType",
     "ScheduledEventLocationType",
     "InputTextStyle",
     "SlashCommandOptionType",
@@ -96,21 +99,17 @@ def _create_value_cls(name, comparable):
     cls.__repr__ = lambda self: f"<{name}.{self.name}: {self.value!r}>"
     cls.__str__ = lambda self: f"{name}.{self.name}"
     if comparable:
-        cls.__le__ = (
-            lambda self, other: isinstance(other, self.__class__)
-            and self.value <= other.value
+        cls.__le__ = lambda self, other: (
+            isinstance(other, self.__class__) and self.value <= other.value
         )
-        cls.__ge__ = (
-            lambda self, other: isinstance(other, self.__class__)
-            and self.value >= other.value
+        cls.__ge__ = lambda self, other: (
+            isinstance(other, self.__class__) and self.value >= other.value
         )
-        cls.__lt__ = (
-            lambda self, other: isinstance(other, self.__class__)
-            and self.value < other.value
+        cls.__lt__ = lambda self, other: (
+            isinstance(other, self.__class__) and self.value < other.value
         )
-        cls.__gt__ = (
-            lambda self, other: isinstance(other, self.__class__)
-            and self.value > other.value
+        cls.__gt__ = lambda self, other: (
+            isinstance(other, self.__class__) and self.value > other.value
         )
     return cls
 
@@ -970,13 +969,20 @@ def __int__(self):
         return self.value
 
 
-class ScheduledEventLocationType(Enum):
-    """Scheduled event location type"""
+class ScheduledEventEntityType(Enum):
+    """Scheduled event entity type"""
 
     stage_instance = 1
     voice = 2
     external = 3
 
+    def __int__(self):
+        return self.value
+
+
+# TODO(Paillat-dev): Add @deprecated notice using warnings.deprecated or in some other way
+ScheduledEventLocationType = ScheduledEventEntityType
+
 
 class AutoModTriggerType(Enum):
     """Automod trigger type"""