Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:26:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Allow room presence visibility between users who share a room

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-18 13:41:43 +01:00
parent 7d324612ec
commit faf25e3a83
2 changed files with 45 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
synapse/handlers/presence.py
View file

@ -155,7 +155,10 @@ class PresenceHandler(BaseHandler):
if allowed_by_subscription:
defer.returnValue(True)
# TODO(paul): Check same channel
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)
defer.returnValue(False)
@ -166,16 +169,11 @@ class PresenceHandler(BaseHandler):
observed_user=target_user
)
if visible or True: # XXX: FIXME: Bodge to unbreak matrix.org. breaks UTs.
if visible:
state = yield self.store.get_presence_state(
target_user.localpart
)
else:
# FIXME: *Surely* we shouldn't be 404ing the whole request, whatever
# it is, just because presence info isn't visible?!
# This causes client/api/v1/rooms/!cURbafjkfsMDVwdRDQ%3Amatrix.org/members/list
# to 404 currently
raise SynapseError(404, "Presence information not visible")
else:
# TODO(paul): Have remote server send us permissions set