summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-02-13 16:59:19 +0100
committerGitHub <noreply@github.com>2017-02-13 16:59:19 +0100
commitd7457c7661fa3b28427b21f44252c3abbee45ef8 (patch)
tree791531c7181bf2383b06cfbf1c0f62340d26a943 /synapse/handlers
parentMerge pull request #1913 from matrix-org/kegan/dont-cache-errors (diff)
parentCache get_presence storage (diff)
downloadsynapse-d7457c7661fa3b28427b21f44252c3abbee45ef8.tar.xz
Merge pull request #1914 from matrix-org/erikj/cache_presence
Cache get_presence storage
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/presence.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index fdfce2a88c..da610e430f 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -531,7 +531,7 @@ class PresenceHandler(object):
             # There are things not in our in memory cache. Lets pull them out of
             # the database.
             res = yield self.store.get_presence_for_users(missing)
-            states.update({state.user_id: state for state in res})
+            states.update(res)
 
             missing = [user_id for user_id, state in states.items() if not state]
             if missing: