model: Improve reporting upon moving topic.

Author: srdeotarse

tests/model/test_model.py

@@ -827,7 +827,7 @@ def test_update_private_message(
         ],
     )
     @pytest.mark.parametrize(
-        "req, old_topic, footer_updated",
+        "req, old_topic, new_topic, stream_name, no_of_messages, footer_updated",
         [
             (
                 {
@@ -837,6 +837,15 @@ def test_update_private_message(
                     "topic": "Some topic",
                 },
                 "Some topic",
+                "Some topic",
+                "stream",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 False,
             ),
             (
@@ -846,11 +855,33 @@ def test_update_private_message(
                     "topic": "Topic change",
                 },
                 "Old topic",
+                "Topic change",
+                "stream",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 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",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 False,
             ),
             (
@@ -861,6 +892,15 @@ def test_update_private_message(
                     "topic": "terminal",
                 },
                 "terminal",
+                "terminal",
+                "stream",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 False,
             ),
             (
@@ -871,6 +911,15 @@ def test_update_private_message(
                     "topic": "grett",
                 },
                 "greet",
+                "grett",
+                "stream",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 True,
             ),
             (
@@ -881,15 +930,37 @@ def test_update_private_message(
                     "topic": "party",
                 },
                 "lets_party",
+                "party",
+                "stream",
+                {
+                    "1": 1,
+                    "2": 2,
+                    "3": 3,
+                    "4": 4,
+                    "5": 5,
+                },
                 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,
+        no_of_messages,
+        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
+        model.index["edited_messages"] = no_of_messages
 
         result = model.update_stream_message(**req)
 
@@ -898,7 +969,19 @@ def test_update_stream_message(
         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.")
+            report_success.assert_called_once_with(
+                "You changed "
+                + str(len(no_of_messages))
+                + " message's topic from #"
+                + stream_name
+                + " > "
+                + old_topic
+                + " to #"
+                + stream_name
+                + " > "
+                + new_topic
+                + "."
+            )
         else:
             report_success.assert_not_called()
 

zulipterminal/model.py

@@ -567,8 +567,14 @@ def update_stream_message(
         if response["result"] == "success":
             old_topic = self.index["messages"][message_id].get("subject", None)
             new_topic = request["topic"]
+            stream_name = self.index["messages"][message_id].get(
+                "display_recipient", None
+            )
+            no_of_messages = len(self.index["edited_messages"])
             if old_topic != new_topic:
-                self.controller.report_success("You changed a message's topic.")
+                self.controller.report_success(
+                    f"You changed {no_of_messages} message's topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                )
 
         return response["result"] == "success"