summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-06 16:00:09 +0100
committerErik Johnston <erik@matrix.org>2016-06-06 16:00:09 +0100
commit216a05b3e39e08b0600a39fc111b4d669d06ff7c (patch)
treef54d711a5e6806b6e46e8c9db49f47fc97ee7604 /synapse
parentMerge pull request #842 from matrix-org/erikj/presence_timer (diff)
downloadsynapse-216a05b3e39e08b0600a39fc111b4d669d06ff7c.tar.xz
.values() returns list of sets
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/presence.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index 94160a5be7..6b70fa3817 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -406,7 +406,8 @@ class PresenceHandler(object):
             user_id for user_id, count in self.user_to_num_current_syncs.items()
             if count
         }
-        syncing_user_ids.update(self.external_process_to_current_syncs.values())
+        for user_ids in self.external_process_to_current_syncs.values():
+            syncing_user_ids.update(user_ids)
         return syncing_user_ids
 
     @defer.inlineCallbacks