diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-02-10 18:13:25 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-02-10 18:13:25 +0000 |
| commit | 5e543652340c5085187db3833c5855d6f3b2eff0 (patch) | |
| tree | 44610ce67c08606df99e3c6c2898f0c77eecfd02 /synapse/handlers/presence.py | |
| parent | Add the 'setup_requires' and allow easy_install since jenkins uses them (diff) | |
| parent | Fix code-style (diff) | |
| download | synapse-5e543652340c5085187db3833c5855d6f3b2eff0.tar.xz | |
Merge branch 'develop' into single_source_version_and_dependencies
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index 6a266ee0fe..59287010ed 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -457,9 +457,9 @@ class PresenceHandler(BaseHandler): if state is None: state = yield self.store.get_presence_state(user.localpart) else: -# statuscache = self._get_or_make_usercache(user) -# self._user_cachemap_latest_serial += 1 -# statuscache.update(state, self._user_cachemap_latest_serial) + # statuscache = self._get_or_make_usercache(user) + # self._user_cachemap_latest_serial += 1 + # statuscache.update(state, self._user_cachemap_latest_serial) pass yield self.push_update_to_local_and_remote( @@ -709,7 +709,7 @@ class PresenceHandler(BaseHandler): # TODO(paul) permissions checks - if not user in self._remote_sendmap: + if user not in self._remote_sendmap: self._remote_sendmap[user] = set() self._remote_sendmap[user].add(origin) |