Keep message reference when updating cache messages

changes/1192.bugfix.md

@@ -0,0 +1,2 @@
+Properly garbage collect message references in the cache
+  - Properly deserialize `PartialMessage.referenced_message` as a partial message

hikari/impl/cache.py

@@ -1563,7 +1563,12 @@ def _set_message(
 
         referenced_message: typing.Optional[cache_utility.RefCell[cache_utility.MessageData]] = None
         if message.referenced_message:
-            referenced_message = self._set_message(message.referenced_message)
+            reference_id = message.referenced_message.id
+            referenced_message = self._message_entries.get(reference_id) or self._referenced_messages.get(reference_id)
+
+            if referenced_message:
+                # Since the message is partial, if we don't have it cached, there is nothing we can do about it
+                referenced_message.object.update(message.referenced_message)
 
         # Only increment ref counts if this wasn't previously cached.
         if message.id not in self._referenced_messages and message.id not in self._message_entries:

hikari/impl/entity_factory.py

@@ -2514,9 +2514,9 @@ def deserialize_message(
         if "message_reference" in payload:
             message_reference = self._deserialize_message_reference(payload["message_reference"])
 
-        referenced_message: typing.Optional[message_models.Message] = None
+        referenced_message: typing.Optional[message_models.PartialMessage] = None
         if referenced_message_payload := payload.get("referenced_message"):
-            referenced_message = self.deserialize_message(referenced_message_payload)
+            referenced_message = self.deserialize_partial_message(referenced_message_payload)
 
         application: typing.Optional[message_models.MessageApplication] = None
         if "application" in payload:

hikari/internal/cache.py

@@ -723,9 +723,6 @@ def build_from_entity(
         if not member and message.member:
             member = RefCell(MemberData.build_from_entity(message.member))
 
-        if not referenced_message and message.referenced_message:
-            referenced_message = RefCell(MessageData.build_from_entity(message.referenced_message))
-
         interaction = (
             MessageInteractionData.build_from_entity(message.interaction, user=interaction_user)
             if message.interaction

hikari/messages.py

@@ -895,7 +895,7 @@ class PartialMessage(snowflakes.Unique):
     This is a string used for validating a message was sent.
     """
 
-    referenced_message: undefined.UndefinedNoneOr[Message] = attr.field(hash=False, eq=False, repr=False)
+    referenced_message: undefined.UndefinedNoneOr[PartialMessage] = attr.field(hash=False, eq=False, repr=False)
     """The message that was replied to.
 
     If `type` is `MessageType.REPLY` and `hikari.undefined.UNDEFINED`, Discord's
@@ -1737,8 +1737,11 @@ class Message(PartialMessage):
     nonce: typing.Optional[str] = attr.field(hash=False, eq=False, repr=False)
     """The message nonce. This is a string used for validating a message was sent."""
 
-    referenced_message: typing.Optional[Message] = attr.field(hash=False, eq=False, repr=False)
-    """The message that was replied to."""
+    referenced_message: typing.Optional[PartialMessage] = attr.field(hash=False, eq=False, repr=False)
+    """The message that was replied to.
+
+    If `type` is `MessageType.REPLY` and `builtins.None`, the message was deleted.
+    """
 
     interaction: typing.Optional[MessageInteraction] = attr.field(hash=False, eq=False, repr=False)
     """Information about the interaction this message was created by."""

tests/hikari/impl/test_entity_factory.py

@@ -4818,7 +4818,7 @@ def test_deserialize_message(
         assert message.message_reference.guild_id == 278325129692446720
         assert isinstance(message.message_reference, message_models.MessageReference)
 
-        assert message.referenced_message == entity_factory_impl.deserialize_message(referenced_message)
+        assert message.referenced_message == entity_factory_impl.deserialize_partial_message(referenced_message)
         assert message.flags == message_models.MessageFlag.IS_CROSSPOST
 
         # Sticker