model/test_model: Tests amended.

Previously `test_model` was failing because of missing parameter. This has been fixed now. Also, a bug in the logic of footer notification when sending a message outside of current narrow is fixed.

Author: zee-bit

tests/model/test_model.py

@@ -811,33 +811,35 @@ def test__handle_message_event_with_flags(self, mocker,
 
     @pytest.mark.parametrize('response, narrow, recipients, log', [
         ({'type': 'stream', 'stream_id': 1, 'subject': 'FOO',
-          'id': 1}, [], frozenset(), ['msg_w']),
-        ({'type': 'private', 'id': 1},
+          'id': 1, 'sender_id': 1, 'display_recipient': 'a'},
+         [], frozenset(), ['msg_w']),
+        ({'type': 'private', 'id': 1, 'sender_id': 1, 'subject': 'FOO',
+          'display_recipient': 'a'},
          [['is', 'private']], frozenset(), ['msg_w']),
         ({'type': 'stream', 'id': 1, 'stream_id': 1, 'subject': 'FOO',
-          'display_recipient': 'a'},
+          'display_recipient': 'a', 'sender_id': 1},
          [['stream', 'a']], frozenset(), ['msg_w']),
         ({'type': 'stream', 'id': 1, 'stream_id': 1, 'subject': 'b',
-          'display_recipient': 'a'},
+          'display_recipient': 'a', 'sender_id': 1},
          [['stream', 'a'], ['topic', 'b']],
          frozenset(), ['msg_w']),
         ({'type': 'stream', 'id': 1, 'stream_id': 1, 'subject': 'b',
-          'display_recipient': 'a'},
+          'display_recipient': 'a', 'sender_id': 1},
          [['stream', 'c'], ['topic', 'b']],
          frozenset(), []),
-        ({'type': 'private', 'id': 1,
+        ({'type': 'private', 'id': 1, 'sender_id': 1, 'subject': 'FOO',
           'display_recipient': [{'id': 5827}, {'id': 5}]},
          [['pm_with', 'notification-bot@zulip.com']],
          frozenset({5827, 5}), ['msg_w']),
-        ({'type': 'private', 'id': 1},
-         [['is', 'search']],
+        ({'type': 'private', 'id': 1, 'sender_id': 1, 'subject': 'FOO',
+          'display_recipient': 'a'}, [['is', 'search']],
          frozenset(), []),
-        ({'type': 'private', 'id': 1,
+        ({'type': 'private', 'id': 1, 'sender_id': 1, 'subject': 'FOO',
           'display_recipient': [{'id': 5827}, {'id': 3212}]},
          [['pm_with', 'notification-bot@zulip.com']],
          frozenset({5827, 5}), []),
         ({'type': 'stream', 'id': 1, 'stream_id': 1, 'subject': 'c',
-          'display_recipient': 'a', 'flags': ['mentioned']},
+          'display_recipient': 'a', 'sender_id': 1, 'flags': ['mentioned']},
          [['is', 'mentioned']], frozenset(), ['msg_w']),
     ], ids=['stream_to_all_messages', 'private_to_all_private',
             'stream_to_stream', 'stream_to_topic',

zulipterminal/model.py

@@ -976,15 +976,16 @@ def _handle_message_event(self, event: Event) -> None:
                 if narrow_recipients == message_recipients:
                     msg_log.append(msg_w)
 
-            print("message_sender_id =>",message['sender_id'], flush=True)
-            print("user_id =>",self.user_id, flush=True)
+            print("message =>", message, flush=True)
+            print("message_sender_id =>", message['sender_id'], flush=True)
+            print("user_id =>", self.user_id, flush=True)
             print("message_type =>", message['type'], flush=True)
             print("message_subject =>", message['subject'], flush=True)
             if (((len(self.narrow) == 1
-                and self.narrow[0][1] != message['type'])
+                and self.narrow[0][1] != message['display_recipient'])
                     or (len(self.narrow) == 2
                         and self.narrow[1][1] != message['subject']))
-                            and message['sender_id'] == self.user_id):
+                    and message['sender_id'] == self.user_id):
                 self.controller.view.set_footer_text(
                     'Message sent outside of current narrow', 3)