refactor!: move some guild events

Author: VincentRPS

discord/app/state.py

@@ -491,113 +491,6 @@ async def query_members(
             )
             raise
 
-
-    def parse_guild_member_add(self, data) -> None:
-        guild = self._get_guild(int(data["guild_id"]))
-        if guild is None:
-            _log.debug(
-                "GUILD_MEMBER_ADD referencing an unknown guild ID: %s. Discarding.",
-                data["guild_id"],
-            )
-            return
-
-        member = Member(guild=guild, data=data, state=self)
-        if self.member_cache_flags.joined:
-            guild._add_member(member)
-
-        if guild._member_count is not None:
-            guild._member_count += 1
-
-        self.dispatch("member_join", member)
-
-    def parse_guild_member_remove(self, data) -> None:
-        user = self.store_user(data["user"])
-        raw = RawMemberRemoveEvent(data, user)
-
-        guild = self._get_guild(int(data["guild_id"]))
-        if guild is not None:
-            if guild._member_count is not None:
-                guild._member_count -= 1
-
-            member = guild.get_member(user.id)
-            if member is not None:
-                raw.user = member
-                guild._remove_member(member)  # type: ignore
-                self.dispatch("member_remove", member)
-        else:
-            _log.debug(
-                "GUILD_MEMBER_REMOVE referencing an unknown guild ID: %s. Discarding.",
-                data["guild_id"],
-            )
-        self.dispatch("raw_member_remove", raw)
-
-    def parse_guild_member_update(self, data) -> None:
-        guild = self._get_guild(int(data["guild_id"]))
-        user = data["user"]
-        user_id = int(user["id"])
-        if guild is None:
-            _log.debug(
-                "GUILD_MEMBER_UPDATE referencing an unknown guild ID: %s. Discarding.",
-                data["guild_id"],
-            )
-            return
-
-        member = guild.get_member(user_id)
-        if member is not None:
-            old_member = Member._copy(member)
-            member._update(data)
-            user_update = member._update_inner_user(user)
-            if user_update:
-                self.dispatch("user_update", user_update[0], user_update[1])
-
-            self.dispatch("member_update", old_member, member)
-        else:
-            if self.member_cache_flags.joined:
-                member = Member(data=data, guild=guild, state=self)
-
-                # Force an update on the inner user if necessary
-                user_update = member._update_inner_user(user)
-                if user_update:
-                    self.dispatch("user_update", user_update[0], user_update[1])
-
-                guild._add_member(member)
-            _log.debug(
-                "GUILD_MEMBER_UPDATE referencing an unknown member ID: %s. Discarding.",
-                user_id,
-            )
-
-    def parse_guild_emojis_update(self, data) -> None:
-        guild = self._get_guild(int(data["guild_id"]))
-        if guild is None:
-            _log.debug(
-                "GUILD_EMOJIS_UPDATE referencing an unknown guild ID: %s. Discarding.",
-                data["guild_id"],
-            )
-            return
-
-        before_emojis = guild.emojis
-        for emoji in before_emojis:
-            self._emojis.pop(emoji.id, None)
-        # guild won't be None here
-        guild.emojis = tuple(map(lambda d: self.store_emoji(guild, d), data["emojis"]))  # type: ignore
-        self.dispatch("guild_emojis_update", guild, before_emojis, guild.emojis)
-
-    def parse_guild_stickers_update(self, data) -> None:
-        guild = self._get_guild(int(data["guild_id"]))
-        if guild is None:
-            _log.debug(
-                ("GUILD_STICKERS_UPDATE referencing an unknown guild ID: %s. Discarding."),
-                data["guild_id"],
-            )
-            return
-
-        before_stickers = guild.stickers
-        for emoji in before_stickers:
-            self._stickers.pop(emoji.id, None)
-        # guild won't be None here
-        guild.stickers = tuple(map(lambda d: self.store_sticker(guild, d), data["stickers"]))  # type: ignore
-        self.dispatch("guild_stickers_update", guild, before_stickers, guild.stickers)
-
     def _get_create_guild(self, data):
         if data.get("unavailable") is False:
             # GUILD_CREATE with unavailable in the response
@@ -638,72 +531,6 @@ async def _chunk_and_dispatch(self, guild, unavailable):
         else:
             self.dispatch("guild_join", guild)
 
-    def parse_guild_create(self, data) -> None:
-        unavailable = data.get("unavailable")
-        if unavailable is True:
-            # joined a guild with unavailable == True so..
-            return
-
-        guild = self._get_create_guild(data)
-
-        try:
-            # Notify the on_ready state, if any, that this guild is complete.
-            self._ready_state.put_nowait(guild)
-        except AttributeError:
-            pass
-        else:
-            # If we're waiting for the event, put the rest on hold
-            return
-
-        # check if it requires chunking
-        if self._guild_needs_chunking(guild):
-            asyncio.create_task(self._chunk_and_dispatch(guild, unavailable))
-            return
-
-        # Dispatch available if newly available
-        if unavailable is False:
-            self.dispatch("guild_available", guild)
-        else:
-            self.dispatch("guild_join", guild)
-
-    def parse_guild_update(self, data) -> None:
-        guild = self._get_guild(int(data["id"]))
-        if guild is not None:
-            old_guild = copy.copy(guild)
-            guild._from_data(data)
-            self.dispatch("guild_update", old_guild, guild)
-        else:
-            _log.debug(
-                "GUILD_UPDATE referencing an unknown guild ID: %s. Discarding.",
-                data["id"],
-            )
-
-    def parse_guild_delete(self, data) -> None:
-        guild = self._get_guild(int(data["id"]))
-        if guild is None:
-            _log.debug(
-                "GUILD_DELETE referencing an unknown guild ID: %s. Discarding.",
-                data["id"],
-            )
-            return
-
-        if data.get("unavailable", False):
-            # GUILD_DELETE with unavailable being True means that the
-            # guild that was available is now currently unavailable
-            guild.unavailable = True
-            self.dispatch("guild_unavailable", guild)
-            return
-
-        # do a cleanup of the messages cache
-        if self._messages is not None:
-            self._messages: Deque[Message] | None = deque(
-                (msg for msg in self._messages if msg.guild != guild),
-                maxlen=self.max_messages,
-            )
-
-        self._remove_guild(guild)
-        self.dispatch("guild_remove", guild)
-
     def parse_guild_audit_log_entry_create(self, data) -> None:
         guild = self._get_guild(int(data["guild_id"]))
         if guild is None:

discord/audit_logs.py

@@ -272,6 +272,7 @@ class AuditLogChanges:
         "exempt_channels": (None, _transform_channels),
     }
 
+    @staticmethod
     async def _maybe_await(func: Any) -> Any:
         if isawaitable(func):
             return await func

discord/events/automod.py

@@ -31,6 +31,7 @@
 
 class AutoModRuleCreate(Event):
     __event_name__ = "AUTO_MODERATION_RULE_CREATE"
+    __slots__ = ("rule")
 
     rule: AutoModRule
 
@@ -43,6 +44,7 @@ async def __load__(cls, data: Any, state: ConnectionState) -> Self:
 
 class AutoModRuleUpdate(Event):
     __event_name__ = "AUTO_MODERATION_RULE_UPDATE"
+    __slots__ = ("rule")
 
     rule: AutoModRule
 
@@ -55,6 +57,7 @@ async def __load__(cls, data: Any, state: ConnectionState) -> Self:
 
 class AutoModRuleDelete(Event):
     __event_name__ = "AUTO_MODERATION_RULE_DELETE"
+    __slots__ = ("rule")
 
     rule: AutoModRule