model: Improve reporting upon moving/spliting topic.

Author: srdeotarse

tests/model/test_model.py

@@ -834,7 +834,7 @@ def test_update_private_message(
         ],
     )
     @pytest.mark.parametrize(
-        "req, old_topic, footer_updated",
+        "req, old_topic, new_topic, stream_name, propagate_mode, footer_updated",
         [
             (
                 {
@@ -844,6 +844,9 @@ def test_update_private_message(
                     "topic": "Some topic",
                 },
                 "Some topic",
+                "Some topic",
+                "stream",
+                "change_one",
                 False,
             ),
             (
@@ -853,11 +856,21 @@ def test_update_private_message(
                     "topic": "Topic change",
                 },
                 "Old topic",
+                "Topic change",
+                "stream",
+                "change_one",
                 True,
             ),
             (
-                {"message_id": 1, "propagate_mode": "change_all", "topic": "Old topic"},
+                {
+                    "message_id": 1,
+                    "propagate_mode": "change_all",
+                    "topic": "Old topic",
+                },
+                "Old topic",
                 "Old topic",
+                "stream",
+                "change_one",
                 False,
             ),
             (
@@ -868,6 +881,9 @@ def test_update_private_message(
                     "topic": "terminal",
                 },
                 "terminal",
+                "terminal",
+                "stream",
+                "change_later",
                 False,
             ),
             (
@@ -878,6 +894,9 @@ def test_update_private_message(
                     "topic": "grett",
                 },
                 "greet",
+                "grett",
+                "stream",
+                "change_one",
                 True,
             ),
             (
@@ -888,24 +907,54 @@ def test_update_private_message(
                     "topic": "party",
                 },
                 "lets_party",
+                "party",
+                "stream",
+                "change_all",
                 True,
             ),
         ],
     )
     def test_update_stream_message(
-        self, mocker, model, response, return_value, req, old_topic, footer_updated
+        self,
+        mocker,
+        model,
+        response,
+        return_value,
+        req,
+        old_topic,
+        new_topic,
+        stream_name,
+        propagate_mode,
+        footer_updated,
     ):
         self.client.update_message = mocker.Mock(return_value=response)
         model.index["messages"][req["message_id"]]["subject"] = old_topic
+        req["topic"] = new_topic
+        model.index["messages"][req["message_id"]]["display_recipient"] = stream_name
+        req["propagate_mode"] = propagate_mode
+
+        recent_moved_msgs = ""
+        if propagate_mode == "change_all":
+            recent_moved_msgs = "all"
+        if propagate_mode == "change_later":
+            recent_moved_msgs = "some"
+        if propagate_mode == "change_one":
+            recent_moved_msgs = "one"
 
         result = model.update_stream_message(**req)
-
         self.client.update_message.assert_called_once_with(req)
         assert result == return_value
         self.display_error_if_present.assert_called_once_with(response, self.controller)
         report_success = model.controller.report_success
         if result and footer_updated:
-            report_success.assert_called_once_with("You changed a message's topic.")
+            if recent_moved_msgs == "one":
+                report_success.assert_called_once_with(
+                    f"You changed {recent_moved_msgs} message's topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                )
+            else:
+                report_success.assert_called_once_with(
+                    f"You changed {recent_moved_msgs} messages' topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                )
         else:
             report_success.assert_not_called()
 

zulipterminal/model.py

@@ -576,10 +576,28 @@ def update_stream_message(
         response = self.client.update_message(request)
         display_error_if_present(response, self.controller)
         if response["result"] == "success":
-            old_topic = self.index["messages"][message_id].get("subject", None)
+            get_message = self.index["messages"]
+            old_topic = get_message[message_id].get("subject", None)
             new_topic = request["topic"]
+            stream_name = get_message[message_id].get("display_recipient", None)
+
+            recent_moved_msgs = ""
+            if propagate_mode == "change_all":
+                recent_moved_msgs = "all"
+            if propagate_mode == "change_later":
+                recent_moved_msgs = "some"
+            if propagate_mode == "change_one":
+                recent_moved_msgs = "one"
+
             if old_topic != new_topic:
-                self.controller.report_success("You changed a message's topic.")
+                if recent_moved_msgs == "one":
+                    self.controller.report_success(
+                        f"You changed {recent_moved_msgs} message's topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                    )
+                else:
+                    self.controller.report_success(
+                        f"You changed {recent_moved_msgs} messages' topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                    )
 
         return response["result"] == "success"