Don't pre-populate ModmailConversation.messages

(cherry picked from commit praw-dev/praw@3172943)
praw-dev · Nov 28, 2022 · 2170b2d · 2170b2d
1 parent 259a2af
commit 2170b2d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,11 @@ Async PRAW follows `semantic versioning <http://semver.org/>`_.
 Unreleased
 ----------
 
+**Fixed**
+
+- An issue where :class:`.ModmailConversation`'s ``messages`` attribute would only
+  contain the latest message.
+
 7.6.0 (2022/10/23)
 ------------------
 

diff --git a/asyncpraw/objector.py b/asyncpraw/objector.py
@@ -75,33 +75,18 @@ def _objectify_dict(self, data):
                 if "conversation" in data
                 else data.pop("conversations")
             )
-            parser: "asyncpraw.models.ModmailConversation" = self.parsers[
-                "ModmailConversation"
-            ]
+            parser = self.parsers["ModmailConversation"]
             parser._convert_conversation_objects(data, self._reddit)
-        elif {"messages", "modActions"}.issubset(data):
+        elif {"messages", "modActions"}.issubset(data) or {
+            "legacyFirstMessageId",
+            "state",
+        }.issubset(data):
             parser = self.parsers["ModmailConversation"]
         elif {"conversationIds", "conversations", "messages"}.issubset(data):
-            conversations = []
-            temp_data = {
-                thing_type: data.pop(thing_type, {})
-                for thing_type in ["messages", "modActions"]
-            }
-            for conversation_id in data["conversationIds"]:
-                conversation_data = {
-                    **data["conversations"][conversation_id],
-                    "messages": [],
-                    "modActions": [],
-                }
-                for object_id in conversation_data["objIds"]:
-                    conversation_data[object_id["key"]].append(
-                        self._objectify_dict(
-                            temp_data[object_id["key"]].pop(object_id["id"])
-                        )
-                    )
-                conversations.append(conversation_data)
-            data["conversations"] = conversations
-            del temp_data
+            data["conversations"] = [
+                data["conversations"][conversation_id]
+                for conversation_id in data["conversationIds"]
+            ]
             data = snake_case_keys(data)
             parser = self.parsers["ModmailConversations-list"]
         elif {"actionTypeId", "author", "date"}.issubset(data):