From 0ebd376a53bb75ade6d65db2d716478758c2c9f0 Mon Sep 17 00:00:00 2001
From: hera <matrix@template.upcloud.com>
Date: Wed, 3 May 2017 08:48:47 +0000
Subject: [PATCH] Reenable presence
---
synapse/handlers/initial_sync.py | 1 -
synapse/handlers/presence.py | 4 ----
synapse/handlers/sync.py | 2 +-
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py
index 2a81c11f10..10f5f35a69 100644
--- a/synapse/handlers/initial_sync.py
+++ b/synapse/handlers/initial_sync.py
@@ -372,7 +372,6 @@ 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 11e7dea94c..839d5feb78 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -372,7 +372,6 @@ 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()
@@ -402,7 +401,6 @@ 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
@@ -464,8 +462,6 @@ 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 a1264925af..c0205da1a9 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 False or not block_all_presence_data:
+ if not block_all_presence_data:
yield self._generate_sync_entry_for_presence(
sync_result_builder, newly_joined_rooms, newly_joined_users
)
--
GitLab