Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Neater is_presence_visible() code

This commit is contained in:
Paul "LeoNerd" Evans 2014-09-02 13:30:36 +01:00
parent 4ba5b4b55d
commit ddf3ca7ab3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
synapse/handlers/presence.py
View File

@ -155,19 +155,18 @@ class PresenceHandler(BaseHandler):
if observer_user == observed_user: if observer_user == observed_user:
defer.returnValue(True) defer.returnValue(True)
allowed_by_subscription = yield self.store.is_presence_visible( if (yield self.store.do_users_share_a_room(
observed_localpart=observed_user.localpart, [observer_user, observed_user]
observer_userid=observer_user.to_string(), )):
)
if allowed_by_subscription:
defer.returnValue(True) defer.returnValue(True)
share_room = yield self.store.do_users_share_a_room( if (yield self.store.is_presence_visible(
[observer_user, observed_user] observed_localpart=observed_user.localpart,
) observer_userid=observer_user.to_string(),
)):
defer.returnValue(True)
defer.returnValue(share_room) defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_state(self, target_user, auth_user): def get_state(self, target_user, auth_user):