helper/messages: Add moved_messages to index and it's logic.

Author: Subhasish-Behera

tests/conftest.py

@@ -822,6 +822,7 @@ def empty_index(
             stream_msg_ids_by_stream_id=defaultdict(set, {}),
             topic_msg_ids=defaultdict(dict, {}),
             edited_messages=set(),
+            moved_messages=set(),
             topics=defaultdict(list),
             search=set(),
             messages=defaultdict(

zulipterminal/api_types.py

@@ -81,6 +81,7 @@ class Message(TypedDict, total=False):
     # NOTE: `subject_links` in Zulip 2.1; deprecated from Zulip 3.0 / ZFL 1
     subject_links: List[str]
     is_me_message: bool
+    edit_history: List[Dict[str, Any]]
     reactions: List[Dict[str, Any]]
     submessages: List[Dict[str, Any]]
     flags: List[MessageFlag]

zulipterminal/helper.py

@@ -47,6 +47,9 @@
 )
 
 
+RESOLVED_TOPIC_PREFIX = "✔ "
+
+
 class StreamData(TypedDict):
     name: str
     id: int
@@ -90,6 +93,7 @@ class Index(TypedDict):
     topic_msg_ids: Dict[int, Dict[str, Set[int]]]
     # Extra cached information
     edited_messages: Set[int]  # {message_id, ...}
+    moved_messages: Set[int]
     topics: Dict[int, List[str]]  # {topic names, ...}
     search: Set[int]  # {message_id, ...}
     # Downloaded message data by message id
@@ -106,6 +110,7 @@ class Index(TypedDict):
     stream_msg_ids_by_stream_id=defaultdict(set),
     topic_msg_ids=defaultdict(dict),
     edited_messages=set(),
+    moved_messages=set(),
     topics=defaultdict(list),
     search=set(),
     # mypy bug: https://github.com/python/mypy/issues/7217
@@ -399,8 +404,44 @@ def index_messages(messages: List[Message], model: Any, index: Index) -> Index:
     narrow = model.narrow
     for msg in messages:
         if "edit_history" in msg:
-            index["edited_messages"].add(msg["id"])
-
+            for edit_history_event in msg["edit_history"]:
+                if "prev_content" in edit_history_event:
+                    index["edited_messages"].add(msg["id"])
+                if "prev_stream" in edit_history_event:
+                    index["moved_messages"].add(msg["id"])
+                if "prev_topic" in edit_history_event:
+                    # We know it has a topic edit. Now we need to determine if
+                    # it was a true move or a resolve/unresolve.
+                    if not edit_history_event["topic"].startswith(
+                        RESOLVED_TOPIC_PREFIX
+                    ):
+                        if (
+                            edit_history_event["prev_topic"].startswith(
+                                RESOLVED_TOPIC_PREFIX
+                            )
+                            and edit_history_event["prev_topic"][2:]
+                            != edit_history_event["topic"]
+                        ):
+                            index["moved_messages"].add(msg["id"])
+                        if not edit_history_event["prev_topic"].startswith(
+                            RESOLVED_TOPIC_PREFIX
+                        ) and not edit_history_event["topic"].startswith(
+                            RESOLVED_TOPIC_PREFIX
+                        ):
+                            index["moved_messages"].add(msg["id"])
+                    else:
+                        if (
+                            edit_history_event["prev_topic"].startswith(
+                                RESOLVED_TOPIC_PREFIX
+                            )
+                            and edit_history_event["prev_topic"][2:]
+                            != edit_history_event["topic"][2:]
+                        ):
+                            index["moved_messages"].add(msg["id"])
+                else:
+                    index["edited_messages"].add(msg["id"])
+            if msg["id"] not in index["moved_messages"]:
+                index["edited_messages"].add(msg["id"])
         index["messages"][msg["id"]] = msg
         if not narrow:
             index["all_msg_ids"].add(msg["id"])

zulipterminal/ui_tools/messages.py

@@ -723,14 +723,24 @@ def main_view(self) -> List[Any]:
         if self.message["id"] in self.model.index["edited_messages"]:
             edited_label_size = 7
             left_padding = 1
+            is_edited = True
+        elif self.message["id"] in self.model.index["moved_messages"]:
+            edited_label_size = 6
+            left_padding = 2
+            is_edited = False
         else:
             edited_label_size = 0
             left_padding = 8
+            is_edited = True
+        if is_edited:
+            label_text = "EDITED"
+        else:
+            label_text = "MOVED"
 
         wrapped_content = urwid.Padding(
             urwid.Columns(
                 [
-                    (edited_label_size, urwid.Text("EDITED")),
+                    (edited_label_size, urwid.Text(label_text)),
                     urwid.LineBox(
                         urwid.Columns(
                             [