diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
| commit | 9978c5c10310512493b976f482f400bf30a78729 (patch) | |
| tree | 5afafbfa518af855eb654a4a060f692b0ae2332e /synapse/handlers/presence.py | |
| parent | Merge branch 'develop' into application-services (diff) | |
| parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
| download | synapse-9978c5c10310512493b976f482f400bf30a78729.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/handlers/presence.py')
| -rw-r--r-- | synapse/handlers/presence.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index cd0798c2b0..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( @@ -658,7 +658,9 @@ class PresenceHandler(BaseHandler): observers = set(self._remote_recvmap.get(user, set())) if observers: - logger.debug(" | %d interested local observers %r", len(observers), observers) + logger.debug( + " | %d interested local observers %r", len(observers), observers + ) rm_handler = self.homeserver.get_handlers().room_member_handler room_ids = yield rm_handler.get_rooms_for_user(user) @@ -707,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) |