Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-11-10 03:54:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Browse source
This commit is contained in:
Erik Johnston 2014-08-15 17:50:27 +01:00
commit 7f5c7ddea9
11 changed files with 173 additions and 28 deletions
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)
if target_user:
target_users = [target_user]
target_users = set(target_user)
else:
presence = yield self.store.get_presence_list(
user.localpart, accepted=True
)
target_users = [
target_users = set([
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:
state = yield self.store.get_presence_state(user.localpart)