model: Highlight stream name in reporting of moving/splitting topics.

tests/core/test_core.py

@@ -370,12 +370,14 @@ def test_copy_to_clipboard_no_exception(
         controller.copy_to_clipboard(text_to_copy, text_category)
 
         if expected_result == "success":
-            mock_success.assert_called_once_with(f"{text_category} copied successfully")
+            mock_success.assert_called_once_with(
+                [f"{text_category} copied successfully"]
+            )
             mock_warning.assert_not_called()
         else:
             mock_success.assert_not_called()
             mock_warning.assert_called_once_with(
-                f"{text_category} copied, but the clipboard text does not match"
+                [f"{text_category} copied, but the clipboard text does not match"]
             )
 
     def test_copy_to_clipboard_exception(
@@ -415,7 +417,7 @@ def test_open_in_browser_success(
 
         mock_open.assert_called_once_with(url)
         mocked_report_success.assert_called_once_with(
-            f"The link was successfully opened using {mock_get.return_value.name}"
+            [f"The link was successfully opened using {mock_get.return_value.name}"]
         )
 
     def test_open_in_browser_fail__no_browser_controller(
@@ -428,7 +430,7 @@ def test_open_in_browser_fail__no_browser_controller(
 
         controller.open_in_browser("https://chat.zulip.org/#narrow/stream/test")
 
-        mocked_report_error.assert_called_once_with(f"ERROR: {error}")
+        mocked_report_error.assert_called_once_with([f"ERROR: {error}"])
 
     def test_main(self, mocker: MockerFixture, controller: Controller) -> None:
         controller.view.palette = {"default": "theme_properties"}

tests/helper/test_helper.py

@@ -328,7 +328,7 @@ def test_display_error_if_present(
     display_error_if_present(response, controller)
 
     if footer_updated:
-        report_error.assert_called_once_with(response["msg"])
+        report_error.assert_called_once_with([response["msg"]])
     else:
         report_error.assert_not_called()
 
@@ -431,7 +431,9 @@ def test_notify_if_message_sent_outside_narrow(
     if footer_updated:
         key = primary_key_for_command("NARROW_MESSAGE_RECIPIENT")
         report_success.assert_called_once_with(
-            f"Message is sent outside of current narrow. Press [{key}] to narrow to conversation.",
+            [
+                f"Message is sent outside of current narrow. Press [{key}] to narrow to conversation."
+            ],
             duration=6,
         )
     else:

tests/model/test_model.py

@@ -7,6 +7,7 @@
 from pytest import param as case
 from zulip import Client, ZulipError
 
+from zulipterminal.config.symbols import STREAM_TOPIC_SEPARATOR
 from zulipterminal.helper import initial_index, powerset
 from zulipterminal.model import (
     MAX_MESSAGE_LENGTH,
@@ -853,7 +854,15 @@ def test_update_private_message(
                     "topic": "Topic change",
                 },
                 "Old topic",
-                "You changed one message's topic from #stream > Old topic to #stream > Topic change.",
+                [
+                    "You changed one message's topic from ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " Old topic "),
+                    " to ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " Topic change "),
+                    " .",
+                ],
             ),
             case(
                 {
@@ -882,7 +891,15 @@ def test_update_private_message(
                     "topic": "new_terminal",
                 },
                 "old_terminal",
-                "You changed some messages' topic from #stream > old_terminal to #stream > new_terminal.",
+                [
+                    "You changed some messages' topic from ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " old_terminal "),
+                    " to ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " new_terminal "),
+                    " .",
+                ],
             ),
             case(
                 {
@@ -892,7 +909,15 @@ def test_update_private_message(
                     "topic": "grett",
                 },
                 "greet",
-                "You changed one message's topic from #stream > greet to #stream > grett.",
+                [
+                    "You changed one message's topic from ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " greet "),
+                    " to ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " grett "),
+                    " .",
+                ],
             ),
             case(
                 {
@@ -902,7 +927,15 @@ def test_update_private_message(
                     "topic": "party",
                 },
                 "lets_party",
-                "You changed all messages' topic from #stream > lets_party to #stream > party.",
+                [
+                    "You changed all messages' topic from ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " lets_party "),
+                    " to ",
+                    ("footer_contrast", f" stream {STREAM_TOPIC_SEPARATOR} "),
+                    ("footer_contrast", " party "),
+                    " .",
+                ],
             ),
         ],
     )

tests/ui/test_ui.py

@@ -459,7 +459,7 @@ def test_keypress_OPEN_DRAFT(
             view.middle_column.set_focus.assert_called_once_with("footer")
         else:
             view.controller.report_error.assert_called_once_with(
-                "No draft message was saved in this session."
+                ["No draft message was saved in this session."]
             )
 
     @pytest.mark.parametrize("key", keys_for_command("SEARCH_PEOPLE"))

tests/ui/test_ui_tools.py

@@ -2564,9 +2564,11 @@ def test_keypress_EDIT_MESSAGE(
             write_box.msg_write_box.set_edit_text.assert_not_called()
         if expect_footer_text[message_type]:
             if expect_editing_to_succeed[message_type]:
-                report_warning.assert_called_once_with(expect_footer_text[message_type])
+                report_warning.assert_called_once_with(
+                    [expect_footer_text[message_type]]
+                )
             else:
-                report_error.assert_called_once_with(expect_footer_text[message_type])
+                report_error.assert_called_once_with([expect_footer_text[message_type]])
 
     @pytest.mark.parametrize(
         "raw_html, expected_content",

zulipterminal/core.py

@@ -8,7 +8,7 @@
 from functools import partial
 from platform import platform
 from types import TracebackType
-from typing import Any, Dict, List, Optional, Tuple, Type
+from typing import Any, Dict, List, Optional, Tuple, Type, Union
 
 import pyperclip
 import urwid
@@ -400,8 +400,10 @@ def open_in_browser(self, url: str) -> None:
             and os.environ.get("TERM")
         ):
             self.report_error(
-                "No DISPLAY environment variable specified. This could "
-                "likely mean the ZT host is running without a GUI."
+                [
+                    "No DISPLAY environment variable specified. This could "
+                    "likely mean the ZT host is running without a GUI."
+                ]
             )
             return
         try:
@@ -412,11 +414,13 @@ def open_in_browser(self, url: str) -> None:
             with suppress_output():
                 browser_controller.open(url)
                 self.report_success(
-                    f"The link was successfully opened using {browser_controller.name}"
+                    [
+                        f"The link was successfully opened using {browser_controller.name}"
+                    ]
                 )
         except webbrowser.Error as e:
             # Set a footer text if no runnable browser is located
-            self.report_error(f"ERROR: {e}")
+            self.report_error([f"ERROR: {e}"])
 
     @asynch
     def show_typing_notification(self) -> None:
@@ -437,19 +441,31 @@ def show_typing_notification(self) -> None:
         self.is_typing_notification_in_progress = False
         self.view.set_footer_text()
 
-    def report_error(self, text: str, duration: int = 3) -> None:
+    def report_error(
+        self,
+        text: List[Union[str, Tuple[Literal["footer_contrast"], str]]],
+        duration: int = 3,
+    ) -> None:
         """
         Helper to show an error message in footer
         """
         self.view.set_footer_text(text, "task:error", duration)
 
-    def report_success(self, text: str, duration: int = 3) -> None:
+    def report_success(
+        self,
+        text: List[Union[str, Tuple[Literal["footer_contrast"], str]]],
+        duration: int = 3,
+    ) -> None:
         """
         Helper to show a success message in footer
         """
         self.view.set_footer_text(text, "task:success", duration)
 
-    def report_warning(self, text: str, duration: int = 3) -> None:
+    def report_warning(
+        self,
+        text: List[Union[str, Tuple[Literal["footer_contrast"], str]]],
+        duration: int = 3,
+    ) -> None:
         """
         Helper to show a warning message in footer
         """
@@ -494,10 +510,10 @@ def copy_to_clipboard(self, text: str, text_category: str) -> None:
             pyperclip.copy(text)
             clipboard_text = pyperclip.paste()
             if clipboard_text == text:
-                self.report_success(f"{text_category} copied successfully")
+                self.report_success([f"{text_category} copied successfully"])
             else:
                 self.report_warning(
-                    f"{text_category} copied, but the clipboard text does not match"
+                    [f"{text_category} copied, but the clipboard text does not match"]
                 )
         except pyperclip.PyperclipException:
             body = [

zulipterminal/helper.py

@@ -640,7 +640,7 @@ def canonicalize_color(color: str) -> str:
 
 def display_error_if_present(response: Dict[str, Any], controller: Any) -> None:
     if response["result"] == "error" and hasattr(controller, "view"):
-        controller.report_error(response["msg"])
+        controller.report_error([response["msg"]])
 
 
 def check_narrow_and_notify(
@@ -656,7 +656,9 @@ def check_narrow_and_notify(
         key = primary_key_for_command("NARROW_MESSAGE_RECIPIENT")
 
         controller.report_success(
-            f"Message is sent outside of current narrow. Press [{key}] to narrow to conversation.",
+            [
+                f"Message is sent outside of current narrow. Press [{key}] to narrow to conversation."
+            ],
             duration=6,
         )
 

zulipterminal/model.py

@@ -36,6 +36,7 @@
     Subscription,
 )
 from zulipterminal.config.keys import primary_key_for_command
+from zulipterminal.config.symbols import STREAM_TOPIC_SEPARATOR
 from zulipterminal.config.ui_mappings import ROLE_BY_ID, StreamAccessType
 from zulipterminal.helper import (
     Message,
@@ -481,7 +482,7 @@ def session_draft_message(self) -> Optional[Composition]:
 
     def save_draft(self, draft: Composition) -> None:
         self._draft = deepcopy(draft)
-        self.controller.report_success("Saved message as draft")
+        self.controller.report_success(["Saved message as draft"])
 
     @asynch
     def toggle_message_star_status(self, message: Message) -> None:
@@ -580,7 +581,12 @@ def update_stream_message(
             stream_name = message.get("display_recipient", None)
             old_topic = message.get("subject", None)
             new_topic = request["topic"]
-
+            stream_name_markup = (
+                "footer_contrast",
+                f" {stream_name} {STREAM_TOPIC_SEPARATOR} ",
+            )
+            old_topic_markup = ("footer_contrast", f" {old_topic} ")
+            new_topic_markup = ("footer_contrast", f" {new_topic} ")
             if old_topic != new_topic:
                 if propagate_mode == "change_one":
                     messages_changed = "one message's"
@@ -589,9 +595,15 @@ def update_stream_message(
                 else:  # propagate_mode == "change_later":
                     messages_changed = "some messages'"
                 self.controller.report_success(
-                    f"You changed {messages_changed} topic"
-                    + f" from #{stream_name} > {old_topic}"
-                    + f" to #{stream_name} > {new_topic}.",
+                    [
+                        f"You changed {messages_changed} topic from ",
+                        stream_name_markup,
+                        old_topic_markup,
+                        " to ",
+                        stream_name_markup,
+                        new_topic_markup,
+                        " .",
+                    ],
                     duration=6,
                 )
 

zulipterminal/ui.py

@@ -296,7 +296,7 @@ def keypress(self, size: urwid_Box, key: str) -> Optional[str]:
                 self.middle_column.set_focus("footer")
             else:
                 self.controller.report_error(
-                    "No draft message was saved in this session."
+                    ["No draft message was saved in this session."]
                 )
             return key
         elif is_command_key("ABOUT", key):