Skip to content

Commit e316327

Browse files
committed
views/core: Delete all message info popup parameters from inner popups.
Now that the inner popups can exit to the outer popup without having to initialize it, we can remove the parameters of MsgInfoView class from its inner popup classes and their respective show_* functions. Tests updated.
1 parent c734d2a commit e316327

File tree

3 files changed

+6
-80
lines changed

3 files changed

+6
-80
lines changed

tests/ui_tools/test_popups.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -503,19 +503,13 @@ def mock_external_classes(self, mocker: MockerFixture, msg_box: MessageBox) -> N
503503
self.full_rendered_message = FullRenderedMsgView(
504504
controller=self.controller,
505505
message=self.message,
506-
topic_links=OrderedDict(),
507-
message_links=OrderedDict(),
508-
time_mentions=list(),
509506
title="Full Rendered Message",
510507
)
511508

512509
def test_init(self, msg_box: MessageBox) -> None:
513510
assert self.full_rendered_message.title == "Full Rendered Message"
514511
assert self.full_rendered_message.controller == self.controller
515512
assert self.full_rendered_message.message == self.message
516-
assert self.full_rendered_message.topic_links == OrderedDict()
517-
assert self.full_rendered_message.message_links == OrderedDict()
518-
assert self.full_rendered_message.time_mentions == list()
519513
assert self.full_rendered_message.header.widget_list == msg_box.header
520514
assert self.full_rendered_message.footer.widget_list == msg_box.footer
521515

@@ -574,19 +568,13 @@ def mock_external_classes(self, mocker: MockerFixture, msg_box: MessageBox) -> N
574568
self.full_raw_message = FullRawMsgView(
575569
controller=self.controller,
576570
message=self.message,
577-
topic_links=OrderedDict(),
578-
message_links=OrderedDict(),
579-
time_mentions=list(),
580571
title="Full Raw Message",
581572
)
582573

583574
def test_init(self, msg_box: MessageBox) -> None:
584575
assert self.full_raw_message.title == "Full Raw Message"
585576
assert self.full_raw_message.controller == self.controller
586577
assert self.full_raw_message.message == self.message
587-
assert self.full_raw_message.topic_links == OrderedDict()
588-
assert self.full_raw_message.message_links == OrderedDict()
589-
assert self.full_raw_message.time_mentions == list()
590578
assert self.full_raw_message.header.widget_list == msg_box.header
591579
assert self.full_raw_message.footer.widget_list == msg_box.footer
592580

@@ -644,18 +632,12 @@ def mock_external_classes(self, mocker: MockerFixture) -> None:
644632
self.edit_history_view = EditHistoryView(
645633
controller=self.controller,
646634
message=self.message,
647-
topic_links=OrderedDict(),
648-
message_links=OrderedDict(),
649-
time_mentions=list(),
650635
title="Edit History",
651636
)
652637

653638
def test_init(self) -> None:
654639
assert self.edit_history_view.controller == self.controller
655640
assert self.edit_history_view.message == self.message
656-
assert self.edit_history_view.topic_links == OrderedDict()
657-
assert self.edit_history_view.message_links == OrderedDict()
658-
assert self.edit_history_view.time_mentions == list()
659641
self.controller.model.fetch_message_history.assert_called_once_with(
660642
message_id=self.message["id"],
661643
)

zulipterminal/core.py

Lines changed: 6 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -348,61 +348,23 @@ def show_msg_sender_info(self, user_id: int) -> None:
348348
"area:user",
349349
)
350350

351-
def show_full_rendered_message(
352-
self,
353-
message: Message,
354-
topic_links: Dict[str, Tuple[str, int, bool]],
355-
message_links: Dict[str, Tuple[str, int, bool]],
356-
time_mentions: List[Tuple[str, str]],
357-
) -> None:
351+
def show_full_rendered_message(self, message: Message) -> None:
358352
self.show_pop_up(
359353
FullRenderedMsgView(
360-
self,
361-
message,
362-
topic_links,
363-
message_links,
364-
time_mentions,
365-
f"Full rendered message {SCROLL_PROMPT}",
354+
self, message, f"Full rendered message {SCROLL_PROMPT}"
366355
),
367356
"area:msg",
368357
)
369358

370-
def show_full_raw_message(
371-
self,
372-
message: Message,
373-
topic_links: Dict[str, Tuple[str, int, bool]],
374-
message_links: Dict[str, Tuple[str, int, bool]],
375-
time_mentions: List[Tuple[str, str]],
376-
) -> None:
359+
def show_full_raw_message(self, message: Message) -> None:
377360
self.show_pop_up(
378-
FullRawMsgView(
379-
self,
380-
message,
381-
topic_links,
382-
message_links,
383-
time_mentions,
384-
f"Full raw message {SCROLL_PROMPT}",
385-
),
361+
FullRawMsgView(self, message, f"Full raw message {SCROLL_PROMPT}"),
386362
"area:msg",
387363
)
388364

389-
def show_edit_history(
390-
self,
391-
message: Message,
392-
topic_links: Dict[str, Tuple[str, int, bool]],
393-
message_links: Dict[str, Tuple[str, int, bool]],
394-
time_mentions: List[Tuple[str, str]],
395-
) -> None:
365+
def show_edit_history(self, message: Message) -> None:
396366
self.show_pop_up(
397-
EditHistoryView(
398-
self,
399-
message,
400-
topic_links,
401-
message_links,
402-
time_mentions,
403-
f"Edit History {SCROLL_PROMPT}",
404-
),
405-
"area:msg",
367+
EditHistoryView(self, message, f"Edit History {SCROLL_PROMPT}"), "area:msg"
406368
)
407369

408370
def open_in_browser(self, url: str) -> None:

zulipterminal/ui_tools/views.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,16 +1798,10 @@ def __init__(
17981798
self,
17991799
controller: Any,
18001800
message: Message,
1801-
topic_links: Dict[str, Tuple[str, int, bool]],
1802-
message_links: Dict[str, Tuple[str, int, bool]],
1803-
time_mentions: List[Tuple[str, str]],
18041801
title: str,
18051802
) -> None:
18061803
self.controller = controller
18071804
self.message = message
1808-
self.topic_links = topic_links
1809-
self.message_links = message_links
1810-
self.time_mentions = time_mentions
18111805
width = 64
18121806
widgets: List[Any] = []
18131807

@@ -1912,16 +1906,10 @@ def __init__(
19121906
self,
19131907
controller: Any,
19141908
message: Message,
1915-
topic_links: Dict[str, Tuple[str, int, bool]],
1916-
message_links: Dict[str, Tuple[str, int, bool]],
1917-
time_mentions: List[Tuple[str, str]],
19181909
title: str,
19191910
) -> None:
19201911
self.controller = controller
19211912
self.message = message
1922-
self.topic_links = topic_links
1923-
self.message_links = message_links
1924-
self.time_mentions = time_mentions
19251913
max_cols, max_rows = controller.maximum_popup_dimensions()
19261914

19271915
# Get rendered message
@@ -1944,16 +1932,10 @@ def __init__(
19441932
self,
19451933
controller: Any,
19461934
message: Message,
1947-
topic_links: Dict[str, Tuple[str, int, bool]],
1948-
message_links: Dict[str, Tuple[str, int, bool]],
1949-
time_mentions: List[Tuple[str, str]],
19501935
title: str,
19511936
) -> None:
19521937
self.controller = controller
19531938
self.message = message
1954-
self.topic_links = topic_links
1955-
self.message_links = message_links
1956-
self.time_mentions = time_mentions
19571939
max_cols, max_rows = controller.maximum_popup_dimensions()
19581940

19591941
# Get rendered message header and footer

0 commit comments

Comments
 (0)