Skip to content

Commit 0fb5bf0

Browse files
Niloth-psumanthvrao
andcommitted
model: Replace the dummy message on receiving a new message.
Co-authored-by: Sumanth V Rao <[email protected]>
1 parent dcb213a commit 0fb5bf0

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

tests/model/test_model.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,6 +1913,7 @@ def test__handle_message_event_with_Falsey_log(
19131913
mocker.patch(MODEL + "._update_topic_index")
19141914
mocker.patch(MODULE + ".index_messages", return_value={})
19151915
self.controller.view.message_view = mocker.Mock(log=[])
1916+
self.controller.is_in_empty_narrow = False
19161917
create_msg_box_list = mocker.patch(
19171918
MODULE + ".create_msg_box_list", return_value=["msg_w"]
19181919
)
@@ -1932,6 +1933,7 @@ def test__handle_message_event_with_valid_log(self, mocker, model, message_fixtu
19321933
mocker.patch(MODEL + "._update_topic_index")
19331934
mocker.patch(MODULE + ".index_messages", return_value={})
19341935
self.controller.view.message_view = mocker.Mock(log=[mocker.Mock()])
1936+
self.controller.is_in_empty_narrow = False
19351937
create_msg_box_list = mocker.patch(
19361938
MODULE + ".create_msg_box_list", return_value=["msg_w"]
19371939
)
@@ -1954,6 +1956,7 @@ def test__handle_message_event_with_flags(self, mocker, model, message_fixture):
19541956
mocker.patch(MODEL + "._update_topic_index")
19551957
mocker.patch(MODULE + ".index_messages", return_value={})
19561958
self.controller.view.message_view = mocker.Mock(log=[mocker.Mock()])
1959+
self.controller.is_in_empty_narrow = False
19571960
mocker.patch(MODULE + ".create_msg_box_list", return_value=["msg_w"])
19581961
model.notify_user = mocker.Mock()
19591962
set_count = mocker.patch(MODULE + ".set_count")
@@ -2097,6 +2100,7 @@ def test__handle_message_event(
20972100
(
20982101
self.controller.view.left_panel.is_in_topic_view_with_stream_id.return_value
20992102
) = False
2103+
self.controller.is_in_empty_narrow = False
21002104
model.notify_user = mocker.Mock()
21012105
model.narrow = narrow
21022106
model.recipients = recipients

zulipterminal/model.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,6 +1742,9 @@ def _handle_message_event(self, event: Event) -> None:
17421742
msg_w = msg_w_list[0]
17431743

17441744
if self.current_narrow_contains_message(message):
1745+
if self.controller.is_in_empty_narrow:
1746+
del msg_log[0]
1747+
self.controller.is_in_empty_narrow = False
17451748
msg_log.append(msg_w)
17461749

17471750
self.controller.update_screen()

0 commit comments

Comments
 (0)