From fb4c0ada1ff82a607bf852ebaf92485f80b27a8c Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 5 May 2017 11:02:34 +0100 Subject: [PATCH] Disable presence This reverts commit 0ebd376a53bb75ade6d65db2d716478758c2c9f0 and disables presence a bit more --- synapse/app/synchrotron.py | 1 + synapse/handlers/initial_sync.py | 1 + synapse/handlers/presence.py | 4 ++++ synapse/handlers/sync.py | 2 +- synapse/rest/client/v1/presence.py | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 13c00ef2ba..d36cdf2455 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -121,6 +121,7 @@ class SynchrotronPresence(object): logger.info("Presence process_id is %r", self.process_id) def send_user_sync(self, user_id, is_syncing, last_sync_ms): + return self.hs.get_tcp_replication().send_user_sync(user_id, is_syncing, last_sync_ms) def mark_as_coming_online(self, user_id): diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index 10f5f35a69..2a81c11f10 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -372,6 +372,7 @@ class InitialSyncHandler(BaseHandler): @defer.inlineCallbacks def get_presence(): + defer.returnValue([]) states = yield presence_handler.get_states( [m.user_id for m in room_members], as_event=True, diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 839d5feb78..11e7dea94c 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -372,6 +372,7 @@ class PresenceHandler(object): """We've seen the user do something that indicates they're interacting with the app. """ + return user_id = user.to_string() bump_active_time_counter.inc() @@ -401,6 +402,7 @@ class PresenceHandler(object): Useful for streams that are not associated with an actual client that is being used by a user. """ + affect_presence = False if affect_presence: curr_sync = self.user_to_num_current_syncs.get(user_id, 0) self.user_to_num_current_syncs[user_id] = curr_sync + 1 @@ -462,6 +464,8 @@ class PresenceHandler(object): syncing_user_ids(set(str)): The set of user_ids that are currently syncing on that server. """ + return + # Grab the previous list of user_ids that were syncing on that process prev_syncing_user_ids = ( self.external_process_to_current_syncs.get(process_id, set()) diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index c0205da1a9..a1264925af 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -539,7 +539,7 @@ class SyncHandler(object): since_token is None and sync_config.filter_collection.blocks_all_presence() ) - if not block_all_presence_data: + if False or not block_all_presence_data: yield self._generate_sync_entry_for_presence( sync_result_builder, newly_joined_rooms, newly_joined_users ) diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py index 47b2dc45e7..dc02b98d5a 100644 --- a/synapse/rest/client/v1/presence.py +++ b/synapse/rest/client/v1/presence.py @@ -81,7 +81,7 @@ class PresenceStatusRestServlet(ClientV1RestServlet): except: raise SynapseError(400, "Unable to parse state") - yield self.presence_handler.set_state(user, state) + # yield self.presence_handler.set_state(user, state) defer.returnValue((200, {}))