tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

When starting to poll for presence, also include members of all shared rooms

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-08-15 17:12:07 +01:00
parent ec1fd20e59
commit 9c41f635a9
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
synapse/handlers/presence.py
View file

@ -380,14 +380,23 @@ class PresenceHandler(BaseHandler):
logger.debug("Start polling for presence from %s", user) logger.debug("Start polling for presence from %s", user)
if target_user: if target_user:
target_users = [target_user] target_users = set(target_user)
else: else:
presence = yield self.store.get_presence_list( presence = yield self.store.get_presence_list(
user.localpart, accepted=True user.localpart, accepted=True
) )
target_users = [ target_users = set([
self.hs.parse_userid(x["observed_user_id"]) for x in presence self.hs.parse_userid(x["observed_user_id"]) for x in presence
] ])
# Also include people in all my rooms
rm_handler = self.homeserver.get_handlers().room_member_handler
room_ids = yield rm_handler.get_rooms_for_user(user)
for room_id in room_ids:
for member in (yield rm_handler.get_room_members(room_id)):
target_users.add(member)
if state is None: if state is None:
state = yield self.store.get_presence_state(user.localpart) state = yield self.store.get_presence_state(user.localpart)