From 43bb12e640ce1563541b246bffe09870d43892ea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 5 May 2017 11:02:34 +0100
Subject: Disable presence

This reverts commit 0ebd376a53bb75ade6d65db2d716478758c2c9f0 and
disables presence a bit more
---
 synapse/handlers/initial_sync.py | 1 +
 synapse/handlers/presence.py     | 3 +++
 synapse/handlers/sync.py         | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'synapse/handlers')

diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py
index 71af86fe21..5242309c1e 100644
--- a/synapse/handlers/initial_sync.py
+++ b/synapse/handlers/initial_sync.py
@@ -373,6 +373,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 7fe568132f..c7336020a2 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -391,6 +391,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()
@@ -420,6 +421,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
@@ -465,6 +467,7 @@ class PresenceHandler(object):
         Returns:
             set(str): A set of user_id strings.
         """
+        return set()
         syncing_user_ids = {
             user_id for user_id, count in self.user_to_num_current_syncs.items()
             if count
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 51ec727df0..1e8a50514b 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -620,7 +620,7 @@ class SyncHandler(object):
             since_token is None and
             sync_config.filter_collection.blocks_all_presence()
         )
-        if not block_all_presence_data:
+        if False and not block_all_presence_data:
             yield self._generate_sync_entry_for_presence(
                 sync_result_builder, newly_joined_rooms, newly_joined_users
             )
-- 
cgit 1.5.1