tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests 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
Show stats 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

45
tests/handlers/test_presence.py
View file

@ -80,6 +80,14 @@ class PresenceStateTestCase(unittest.TestCase):
return defer.succeed(allow)
self.datastore.is_presence_visible = is_presence_visible
# Mock the RoomMemberHandler
room_member_handler = Mock(spec=[
"get_rooms_for_user",
"get_room_members",
])
hs.handlers.room_member_handler = room_member_handler
logging.getLogger().debug("Mocking room_member_handler=%r", room_member_handler)
# Some local users to test with
self.u_apple = hs.parse_userid("@apple:test")
self.u_banana = hs.parse_userid("@banana:test")
@ -87,11 +95,21 @@ class PresenceStateTestCase(unittest.TestCase):
self.handler = hs.get_handlers().presence_handler
hs.handlers.room_member_handler = Mock(spec=[
"get_rooms_for_user",
])
hs.handlers.room_member_handler.get_rooms_for_user = (
lambda u: defer.succeed([]))
self.room_members = []
def get_rooms_for_user(user):
if user in self.room_members:
return defer.succeed(["a-room"])
else:
return defer.succeed([])
room_member_handler.get_rooms_for_user = get_rooms_for_user
def get_room_members(room_id):
if room_id == "a-room":
return defer.succeed(self.room_members)
else:
return defer.succeed([])
room_member_handler.get_room_members = get_room_members
self.mock_start = Mock()
self.mock_stop = Mock()
@ -131,6 +149,21 @@ class PresenceStateTestCase(unittest.TestCase):
)
mocked_get.assert_called_with("apple")
@defer.inlineCallbacks
def test_get_same_room_state(self):
mocked_get = self.datastore.get_presence_state
mocked_get.return_value = defer.succeed(
{"state": ONLINE, "status_msg": "Online"}
)
self.room_members = [self.u_apple, self.u_clementine]
state = yield self.handler.get_state(
target_user=self.u_apple, auth_user=self.u_clementine
)
self.assertEquals({"state": ONLINE, "status_msg": "Online"}, state)
@defer.inlineCallbacks
def test_get_disallowed_state(self):
mocked_get = self.datastore.get_presence_state
@ -138,6 +171,8 @@ class PresenceStateTestCase(unittest.TestCase):
{"state": ONLINE, "status_msg": "Online"}
)
self.room_members = []
yield self.assertFailure(
self.handler.get_state(
target_user=self.u_apple, auth_user=self.u_clementine