diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 14:59:54 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 14:59:54 +0100 |
| commit | 27979028b2d7bb248c7e70d09ab0f79b708f8e5a (patch) | |
| tree | d7943508bd16f2c4e2d81590ad1edcc1ff1d4d5c /synapse/handlers | |
| parent | webclient: Updated to use /rooms/$roomid/[invite|join|leave] (diff) | |
| parent | Add the ability to turn on the twisted manhole telnet service. (diff) | |
| download | synapse-27979028b2d7bb248c7e70d09ab0f79b708f8e5a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into client_server_url_rename
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/presence.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py index c88cc18788..471dc86163 100644 --- a/synapse/handlers/presence.py +++ b/synapse/handlers/presence.py @@ -159,12 +159,11 @@ class PresenceHandler(BaseHandler): if allowed_by_subscription: defer.returnValue(True) - rm_handler = self.homeserver.get_handlers().room_member_handler - for room_id in (yield rm_handler.get_rooms_for_user(observer_user)): - if observed_user in (yield rm_handler.get_room_members(room_id)): - defer.returnValue(True) + share_room = yield self.store.do_users_share_a_room( + [observer_user, observed_user] + ) - defer.returnValue(False) + defer.returnValue(share_room) @defer.inlineCallbacks def get_state(self, target_user, auth_user): |