fix: fix some bugs with cache (#970)

* fix: fix some bugs with cache

* you already is None lol

* Update interactions/api/gateway/client.py

Co-authored-by: EdVraz <[email protected]>

* add .lower() to model_name & add new model to ignore

* revert last commit

* oops

Co-authored-by: EdVraz <[email protected]>

Author: Damego

interactions/api/gateway/client.py

@@ -409,30 +409,27 @@ def _dispatch_event(self, event: str, data: dict) -> None:
                     id = getattr(obj, "id", None)
 
                 if id is None:
-                    if model.__name__.startswith("Guild"):
-                        if model.__name__ == "GuildScheduledEventUser":
-                            id = model.guild_scheduled_event_id
-                        elif model.__name__ in [
-                            "Invite",
-                            "GuildBan",
-                            "ChannelPins",
-                            "MessageReaction",
-                            "ReactionRemove",
-                            # Extend this for everything that should not be cached
-                        ]:
-                            id = None
-                        else:
-                            model_name = model.__name__[5:]
-                            if _data := getattr(obj, model_name, None):
-                                id = (
-                                    getattr(_data, "id")
-                                    if not isinstance(_data, dict)
-                                    else Snowflake(_data["id"])
-                                )
-                            elif hasattr(obj, f"{model_name}_id"):
-                                id = getattr(obj, f"{model_name}_id")
-                            else:
-                                id = None
+                    if model.__name__ == "GuildScheduledEventUser":
+                        id = model.guild_scheduled_event_id
+                    elif model.__name__ in [
+                        "Invite",
+                        "GuildBan",
+                        "ChannelPins",
+                        "MessageReaction",
+                        "MessageReactionRemove",
+                        # Extend this for everything that should not be cached
+                    ]:
+                        id = None
+                    elif model.__name__.startswith("Guild"):
+                        model_name = model.__name__[5:]
+                        if _data := getattr(obj, model_name, None):
+                            id = (
+                                getattr(_data, "id")
+                                if not isinstance(_data, dict)
+                                else Snowflake(_data["id"])
+                            )
+                        elif hasattr(obj, f"{model_name}_id"):
+                            id = getattr(obj, f"{model_name}_id", None)
 
                 def __modify_guild_cache():
                     if not (
@@ -450,18 +447,15 @@ def __modify_guild_cache():
                             return
                         _obj = getattr(guild, f"{model_name.lower()}s", None)
                         if _obj is not None and isinstance(_obj, list):
-                            _data = getattr(obj, model_name, None)
-
                             if "_create" in name or "_add" in name:
                                 _obj.append(obj)
-
                             for index, __obj in enumerate(_obj):
                                 if __obj.id == id:
                                     if "_remove" in name or "_delete" in name:
                                         _obj.remove(__obj)
 
                                     elif "_update" in name and hasattr(obj, "id"):
-                                        _obj[index] = _data
+                                        _obj[index] = obj
                                     break
                             setattr(guild, f"{model_name}s", _obj)
                         self._http.cache[Guild].add(guild)
@@ -474,15 +468,14 @@ def __modify_guild_cache():
 
                 elif "_update" in name and hasattr(obj, "id"):
                     old_obj = self._http.cache[model].get(id)
-
                     if old_obj:
                         before = model(**old_obj._json)
                         old_obj.update(**obj._json)
-
-                        _cache.add(old_obj, id)
                     else:
                         before = None
                         old_obj = obj
+
+                    _cache.add(old_obj, id)
                     __modify_guild_cache()
 
                     self._dispatch.dispatch(

interactions/api/models/gw.py

@@ -38,7 +38,7 @@
     "ChannelPins",
     "ThreadMembers",
     "ThreadList",
-    "ReactionRemove",
+    "MessageReactionRemove",
     "MessageReaction",
     "GuildIntegrations",
     "GuildBan",
@@ -762,7 +762,7 @@ class Presence(ClientSerializerMixin):
 @define()
 class MessageReaction(DictSerializerMixin):
     """
-    A class object representing the gateway event ``MESSAGE_REACTION_ADD``.
+    A class object representing the gateway event ``MESSAGE_REACTION_ADD`` and ``MESSAGE_REACTION_REMOVE``.
 
     :ivar Optional[Snowflake] user_id?: The user ID of the event.
     :ivar Snowflake channel_id: The channel ID of the event.
@@ -780,9 +780,9 @@ class MessageReaction(DictSerializerMixin):
     emoji: Optional[Emoji] = field(converter=Emoji, default=None)
 
 
-class ReactionRemove(MessageReaction):
+class MessageReactionRemove(MessageReaction):
     """
-    A class object representing the gateway events ``MESSAGE_REACTION_REMOVE``, ``MESSAGE_REACTION_REMOVE_ALL`` and ``MESSAGE_REACTION_REMOVE_EMOJI``.
+    A class object representing the gateway events ``MESSAGE_REACTION_REMOVE_ALL`` and ``MESSAGE_REACTION_REMOVE_EMOJI``.
 
     .. note::
         This class inherits the already existing attributes of :class:`interactions.api.models.gw.Reaction`.