model: Support updated subscription op=peer_* events for ZFL35+.

Previously these events contained single stream and user ids, but now
instead contain lists of each to reduce the numbers of events required
for cases where users join or leave large numbers of streams.

Tests added & updated.

Author: neiljp

tests/model/test_model.py

@@ -1633,37 +1633,60 @@ def set_from_list_of_dict(data):
         update_left_panel.assert_called_once_with()
         model.controller.update_screen.assert_called_once_with()
 
-    @pytest.mark.parametrize('event, expected_subscribers', [
+    @pytest.mark.parametrize(['event', 'feature_level',
+                              'stream_id', 'expected_subscribers'], [
         ({'type': 'subscription', 'op': 'peer_add',
-          'stream_id': 99, 'user_id': 12}, [1001, 11, 12]),
+          'stream_id': 99, 'user_id': 12}, None, 99, [1001, 11, 12]),
+        ({'type': 'subscription', 'op': 'peer_add',
+          'stream_id': 99, 'user_id': 12}, 34, 99, [1001, 11, 12]),
+        ({'type': 'subscription', 'op': 'peer_add',
+          'stream_ids': [99], 'user_ids': [12]}, 35, 99, [1001, 11, 12]),
+        ({'type': 'subscription', 'op': 'peer_remove',
+          'stream_id': 2, 'user_id': 12}, None, 2, [1001, 11]),
         ({'type': 'subscription', 'op': 'peer_remove',
-          'stream_id': 2, 'user_id': 12}, [1001, 11]),
+          'stream_id': 2, 'user_id': 12}, 34, 2, [1001, 11]),
+        ({'type': 'subscription', 'op': 'peer_remove',
+          'stream_ids': [2], 'user_ids': [12]}, 35, 2, [1001, 11]),
     ], ids=[
-        'user_subscribed_to_stream',
-        'user_unsubscribed_from_stream',
+        'user_subscribed_to_stream:ZFLNone',
+        'user_subscribed_to_stream:ZFL34',
+        'user_subscribed_to_stream:ZFL35',
+        'user_unsubscribed_from_stream:ZFLNone',
+        'user_unsubscribed_from_stream:ZFL34',
+        'user_unsubscribed_from_stream:ZFL35',
     ])
     def test__handle_subscription_event_subscribers(self, model, mocker,
-                                                    stream_dict, event,
+                                                    stream_dict,
+                                                    event, feature_level,
+                                                    stream_id,
                                                     expected_subscribers):
         model.stream_dict = stream_dict
+        model.server_feature_level = feature_level
 
         model._handle_subscription_event(event)
 
-        new_subscribers = model.stream_dict[event['stream_id']]['subscribers']
+        new_subscribers = model.stream_dict[stream_id]['subscribers']
         assert new_subscribers == expected_subscribers
 
-    @pytest.mark.parametrize('event', [
+    @pytest.mark.parametrize('event, feature_level', [
+        ({'type': 'subscription', 'op': 'peer_add',
+          'stream_id': 462, 'user_id': 12}, 34),
         ({'type': 'subscription', 'op': 'peer_add',
-          'stream_id': 462, 'user_id': 12}),
+          'stream_ids': [462], 'user_ids': [12]}, 35),
+        ({'type': 'subscription', 'op': 'peer_remove',
+          'stream_id': 462, 'user_id': 12}, 34),
         ({'type': 'subscription', 'op': 'peer_remove',
-          'stream_id': 462, 'user_id': 12}),
+          'stream_ids': [462], 'user_ids': [12]}, 35),
     ], ids=[
         'peer_subscribed_to_stream_that_user_is_unsubscribed_to',
+        'peer_subscribed_to_stream_that_user_is_unsubscribed_to:ZFL35+',
         'peer_unsubscribed_from_stream_that_user_is_unsubscribed_to',
+        'peer_unsubscribed_from_stream_that_user_is_unsubscribed_to:ZFL35+',
     ])
     def test__handle_subscription_event_subscribers_to_unsubscribed_streams(
-                            self, model, mocker, stream_dict, event):
+                    self, model, mocker, stream_dict, event, feature_level):
         model.stream_dict = deepcopy(stream_dict)
+        model.server_feature_level = feature_level
 
         model._handle_subscription_event(event)
 

zulipterminal/model.py

@@ -49,7 +49,9 @@
     # subscription:
     'property': str,
     'user_id': int,  # Present when a streams subscribers are updated.
+    'user_ids': List[int],  # NOTE: replaces 'user_id' in ZFL 35
     'stream_id': int,
+    'stream_ids': List[int],  # NOTE: replaces 'stream_id' in ZFL 35 for peer*
     'value': bool,
     'message_ids': List[int]  # Present when subject of msg(s) is updated
 }, total=False)  # Each Event will only have a subset of these
@@ -786,8 +788,13 @@ def get_stream_by_id(streams: List[StreamData], stream_id: int
         elif event['op'] in ('peer_add', 'peer_remove'):
             action_map = dict(peer_add='append', peer_remove='remove')
             peers_action = action_map[event['op']]
-            stream_ids = [event['stream_id']]
-            user_ids = [event['user_id']]
+            if (self.server_feature_level is None
+                    or self.server_feature_level < 35):
+                stream_ids = [event['stream_id']]
+                user_ids = [event['user_id']]
+            else:
+                stream_ids = event['stream_ids']
+                user_ids = event['user_ids']
             for stream_id in stream_ids:
                 if self.is_user_subscribed_to_stream(stream_id):
                     peers = self.stream_dict[stream_id]['subscribers']