diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
| commit | d12feed6235ec91e9797a47c98e9da162b6559c9 (patch) | |
| tree | 57f47c24ee7a402f210d7cb07f08521dfba6867c /synapse/handlers/presence.py | |
| parent | Minor spec tweaks. (diff) | |
| parent | Center recaptcha dialog. (diff) | |
| download | synapse-d12feed6235ec91e9797a47c98e9da162b6559c9.tar.xz | |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index c79bb6ff76..b2af09f090 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -796,11 +796,12 @@ class PresenceEventSource(object): updates = [] # TODO(paul): use a DeferredList ? How to limit concurrency. for observed_user in cachemap.keys(): - if not (from_key < cachemap[observed_user].serial): + cached = cachemap[observed_user] + if not (from_key < cached.serial): continue if (yield self.is_visible(observer_user, observed_user)): - updates.append((observed_user, cachemap[observed_user])) + updates.append((observed_user, cached)) # TODO(paul): limit |