model: Improve reporting upon moving/splitting topic.

Author: srdeotarse

tests/model/test_model.py

@@ -834,78 +834,102 @@ def test_update_private_message(
         ],
     )
     @pytest.mark.parametrize(
-        "req, old_topic, footer_updated",
+        "req, old_topic, stream_name, footer_updated, expected_report_success",
         [
-            (
+            case(
                 {
                     "message_id": 1,
                     "propagate_mode": "change_one",
                     "content": "hi!",
                     "topic": "Some topic",
                 },
                 "Some topic",
+                "stream",
                 False,
+                "You changed one message's topic from #stream > Some topic to #stream > Some topic.",
             ),
-            (
+            case(
                 {
                     "message_id": 1,
                     "propagate_mode": "change_one",
                     "topic": "Topic change",
                 },
                 "Old topic",
+                "stream",
                 True,
+                "You changed one message's topic from #stream > Old topic to #stream > Topic change.",
             ),
-            (
-                {"message_id": 1, "propagate_mode": "change_all", "topic": "Old topic"},
+            case(
+                {
+                    "message_id": 1,
+                    "propagate_mode": "change_all",
+                    "topic": "Old topic",
+                },
                 "Old topic",
+                "stream",
                 False,
+                "You changed all messages' topic from #stream > Old topic to #stream > Old change.",
             ),
-            (
+            case(
                 {
                     "message_id": 1,
                     "propagate_mode": "change_later",
                     "content": ":smile:",
                     "topic": "terminal",
                 },
                 "terminal",
+                "stream",
                 False,
+                "You changed some messages' topic from #stream > terminal to #stream > terminal.",
             ),
-            (
+            case(
                 {
                     "message_id": 1,
                     "propagate_mode": "change_one",
                     "content": "Hey!",
                     "topic": "grett",
                 },
                 "greet",
+                "stream",
                 True,
+                "You changed one message's topic from #stream > greet to #stream > grett.",
             ),
-            (
+            case(
                 {
                     "message_id": 1,
                     "propagate_mode": "change_all",
                     "content": "Lets party!",
                     "topic": "party",
                 },
                 "lets_party",
+                "stream",
                 True,
+                "You changed all messages' topic from #stream > lets_party to #stream > party.",
             ),
         ],
     )
     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,
+        stream_name,
+        footer_updated,
+        expected_report_success,
     ):
         self.client.update_message = mocker.Mock(return_value=response)
         model.index["messages"][req["message_id"]]["subject"] = old_topic
-
+        model.index["messages"][req["message_id"]]["display_recipient"] = stream_name
         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.")
+            report_success.assert_called_once_with(expected_report_success)
         else:
             report_success.assert_not_called()
 

zulipterminal/model.py

@@ -576,10 +576,24 @@ 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"][message_id]
+            old_topic = get_message.get("subject", None)
             new_topic = request["topic"]
+            stream_name = get_message.get("display_recipient", None)
+
+            recent_moved_msgs = ""
             if old_topic != new_topic:
-                self.controller.report_success("You changed a message's topic.")
+                if propagate_mode == "change_one":
+                    recent_moved_msgs = "one"
+                    one_message = f"You changed {recent_moved_msgs} message's topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                    self.controller.report_success(one_message)
+                else:
+                    if propagate_mode == "change_all":
+                        recent_moved_msgs = "all"
+                    if propagate_mode == "change_later":
+                        recent_moved_msgs = "some"
+                    some_all_messages = f"You changed {recent_moved_msgs} messages' topic from #{stream_name} > {old_topic} to #{stream_name} > {new_topic}."
+                    self.controller.report_success(some_all_messages)
 
         return response["result"] == "success"