helper: Modify set_counts to use index['unread_msgs'].

Per-message 'sender_id' is not available for stream messages. Due to
this, messages sent by user might cause undesirable behaviours.

Author: kaustubh-nair

tests/model/test_model.py

@@ -1277,7 +1277,7 @@ def test_update_read_status(self, mocker, model, event_op,
                     flags_before)
 
         if event_op == 'add':
-            set_count.assert_called_once_with(list(changed_ids),
+            set_count.assert_called_once_with(list(event_message_ids),
                                               self.controller, -1)
         elif event_op == 'remove':
             set_count.assert_not_called()

zulipterminal/helper.py

@@ -91,7 +91,7 @@ def set_count(id_list: List[int], controller: Any, new_count: int) -> None:
     # (we could ensure this in a different way by a different type)
     assert new_count == 1 or new_count == -1
 
-    messages = controller.model.index['messages']
+    messages = controller.model.index['unread_msgs']
     unread_counts = controller.model.unread_counts  # type: UnreadCounts
 
     for id in id_list:
@@ -100,9 +100,8 @@ def set_count(id_list: List[int], controller: Any, new_count: int) -> None:
         if msg['type'] == 'stream':
             key = (messages[id]['stream_id'], msg['subject'])
             unreads = unread_counts['unread_topics']
-        # self-pm has only one display_recipient
-        # 1-1 pms have 2 display_recipient
-        elif len(msg['display_recipient']) <= 2:
+        # 1-1 pms and self-pms
+        elif msg['type'] == 'private' and 'sender_id' in msg:
             key = messages[id]['sender_id']
             unreads = unread_counts['unread_pms']  # type: ignore
         else:  # If it's a group pm
@@ -133,14 +132,16 @@ def set_count(id_list: List[int], controller: Any, new_count: int) -> None:
     all_msg = controller.view.home_button
     all_pm = controller.view.pm_button
     for id in id_list:
-        user_id = messages[id]['sender_id']
-
-        # If we sent this message, don't increase the count
-        if user_id == controller.model.user_id:
-            continue
-
         msg_type = messages[id]['type']
         add_to_counts = True
+        # FIXME no user_id for streams?
+        if msg_type != 'stream':
+            user_id = messages[id]['sender_id']
+
+            # If we sent this message, don't increase the count
+            if user_id == controller.model.user_id:
+                continue
+
         if msg_type == 'stream':
             stream_id = messages[id]['stream_id']
             msg_topic = messages[id]['subject']

zulipterminal/model.py

@@ -840,8 +840,7 @@ def update_message_flag_status(self, event: Event) -> None:
             self.update_rendered_view(message_id)
 
         if event['operation'] == 'add' and flag_to_change == 'read':
-            set_count(list(message_ids_to_mark & indexed_message_ids),
-                      self.controller, -1)
+            set_count(list(message_ids_to_mark), self.controller, -1)
 
     def update_rendered_view(self, msg_id: int) -> None:
         # Update new content in the rendered view