boxes/core/views: Pass spoiler data to MsgInfoView popup helpers.

Tests amended.

Co-authored-by: Preet Mishra <[email protected]>

Author: Ezio-Sarthak

tests/ui_tools/test_popups.py

@@ -229,6 +229,7 @@ def mock_external_classes(self, mocker):
             topic_links=OrderedDict(),
             message_links=OrderedDict(),
             time_mentions=list(),
+            spoilers=list(),
             title="Edit History",
         )
 
@@ -238,6 +239,7 @@ def test_init(self):
         assert self.edit_history_view.topic_links == OrderedDict()
         assert self.edit_history_view.message_links == OrderedDict()
         assert self.edit_history_view.time_mentions == list()
+        assert self.edit_history_view.spoilers == list()
         self.controller.model.fetch_message_history.assert_called_once_with(
             message_id=self.message["id"],
         )
@@ -271,6 +273,7 @@ def test_keypress_show_msg_info(self, key, widget_size):
             topic_links=OrderedDict(),
             message_links=OrderedDict(),
             time_mentions=list(),
+            spoilers=list(),
         )
 
     def test_keypress_navigation(
@@ -542,13 +545,15 @@ def mock_external_classes(self, mocker, monkeypatch, message_fixture):
             OrderedDict(),
             OrderedDict(),
             list(),
+            list(),
         )
 
     def test_init(self, message_fixture):
         assert self.msg_info_view.msg == message_fixture
         assert self.msg_info_view.topic_links == OrderedDict()
         assert self.msg_info_view.message_links == OrderedDict()
         assert self.msg_info_view.time_mentions == list()
+        assert self.msg_info_view.spoilers == list()
 
     def test_keypress_any_key(self, widget_size):
         key = "a"
@@ -592,6 +597,7 @@ def test_keypress_edit_history(
             topic_links=OrderedDict(),
             message_links=OrderedDict(),
             time_mentions=list(),
+            spoilers=list(),
         )
         size = widget_size(msg_info_view)
 
@@ -603,6 +609,7 @@ def test_keypress_edit_history(
                 topic_links=OrderedDict(),
                 message_links=OrderedDict(),
                 time_mentions=list(),
+                spoilers=list(),
             )
         else:
             self.controller.show_edit_history.assert_not_called()
@@ -688,6 +695,7 @@ def test_height_reactions(self, message_fixture, to_vary_in_each_message):
             OrderedDict(),
             OrderedDict(),
             list(),
+            list(),
         )
         # 10 = 4 labels + 1 blank line + 1 'Reactions' (category)
         # + 4 reactions (excluding 'Message Links').

zulipterminal/core.py

@@ -248,6 +248,7 @@ def show_msg_info(
         topic_links: "OrderedDict[str, Tuple[str, int, bool]]",
         message_links: "OrderedDict[str, Tuple[str, int, bool]]",
         time_mentions: List[Tuple[str, str]],
+        spoilers: List[Tuple[int, List[Any], List[Any]]],
     ) -> None:
         msg_info_view = MsgInfoView(
             self,
@@ -256,6 +257,7 @@ def show_msg_info(
             topic_links,
             message_links,
             time_mentions,
+            spoilers,
         )
         self.show_pop_up(msg_info_view, "area:msg")
 
@@ -293,6 +295,7 @@ def show_edit_history(
         topic_links: "OrderedDict[str, Tuple[str, int, bool]]",
         message_links: "OrderedDict[str, Tuple[str, int, bool]]",
         time_mentions: List[Tuple[str, str]],
+        spoilers: List[Tuple[int, List[Any], List[Any]]],
     ) -> None:
         self.show_pop_up(
             EditHistoryView(
@@ -301,6 +304,7 @@ def show_edit_history(
                 topic_links,
                 message_links,
                 time_mentions,
+                spoilers,
                 "Edit History (up/down scrolls)",
             ),
             "area:msg",

zulipterminal/ui_tools/boxes.py

@@ -1701,7 +1701,11 @@ def keypress(self, size: urwid_Size, key: str) -> Optional[str]:
             self.model.controller.view.middle_column.set_focus("footer")
         elif is_command_key("MSG_INFO", key):
             self.model.controller.show_msg_info(
-                self.message, self.topic_links, self.message_links, self.time_mentions
+                self.message,
+                self.topic_links,
+                self.message_links,
+                self.time_mentions,
+                self.spoilers,
             )
         return key
 

zulipterminal/ui_tools/views.py

@@ -1294,11 +1294,13 @@ def __init__(
         topic_links: "OrderedDict[str, Tuple[str, int, bool]]",
         message_links: "OrderedDict[str, Tuple[str, int, bool]]",
         time_mentions: List[Tuple[str, str]],
+        spoilers: List[Tuple[int, List[Any], List[Any]]],
     ) -> None:
         self.msg = msg
         self.topic_links = topic_links
         self.message_links = message_links
         self.time_mentions = time_mentions
+        self.spoilers = spoilers
         self.server_url = controller.model.server_url
         date_and_time = controller.model.formatted_local_time(
             msg["timestamp"], show_seconds=True, show_year=True
@@ -1417,6 +1419,7 @@ def keypress(self, size: urwid_Size, key: str) -> str:
                 topic_links=self.topic_links,
                 message_links=self.message_links,
                 time_mentions=self.time_mentions,
+                spoilers=self.spoilers,
             )
         elif is_command_key("VIEW_IN_BROWSER", key):
             url = near_message_url(self.server_url[:-1], self.msg)
@@ -1468,13 +1471,15 @@ def __init__(
         topic_links: "OrderedDict[str, Tuple[str, int, bool]]",
         message_links: "OrderedDict[str, Tuple[str, int, bool]]",
         time_mentions: List[Tuple[str, str]],
+        spoilers: List[Tuple[int, List[Any], List[Any]]],
         title: str,
     ) -> None:
         self.controller = controller
         self.message = message
         self.topic_links = topic_links
         self.message_links = message_links
         self.time_mentions = time_mentions
+        self.spoilers = spoilers
         width = 64
         widgets: List[Any] = []
 
@@ -1573,6 +1578,7 @@ def keypress(self, size: urwid_Size, key: str) -> str:
                 topic_links=self.topic_links,
                 message_links=self.message_links,
                 time_mentions=self.time_mentions,
+                spoilers=self.spoilers,
             )
             return key
         return super().keypress(size, key)