From a0c8c1fc4980025a002f592f24c5f918b9dd0692 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 29 Nov 2018 17:15:46 +0000 Subject: Compress some client data --- synapse/handlers/sync.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'synapse/handlers/sync.py') diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 09739f2862..535fe9b76b 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -931,10 +931,7 @@ class SyncHandler(object): newly_joined_rooms, newly_joined_users, _, _ = res _, _, newly_left_rooms, newly_left_users = res - block_all_presence_data = ( - since_token is None and - sync_config.filter_collection.blocks_all_presence() - ) + block_all_presence_data = True if self.hs_config.use_presence and not block_all_presence_data: yield self._generate_sync_entry_for_presence( sync_result_builder, newly_joined_rooms, newly_joined_users @@ -1231,10 +1228,7 @@ class SyncHandler(object): `(newly_joined_rooms, newly_joined_users, newly_left_rooms, newly_left_users)` """ user_id = sync_result_builder.sync_config.user.to_string() - block_all_room_ephemeral = ( - sync_result_builder.since_token is None and - sync_result_builder.sync_config.filter_collection.blocks_all_room_ephemeral() - ) + block_all_room_ephemeral = True if block_all_room_ephemeral: ephemeral_by_room = {} -- cgit 1.5.1