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

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

Browse source 
Conflicts:
	tests/rest/test_presence.py
	tests/rest/test_rooms.py
	tests/utils.py
This commit is contained in:
Erik Johnston 2014-08-19 14:48:19 +01:00
commit 347242a5c4
29 changed files with 1258 additions and 393 deletions
Download patch file Download diff file Expand all files Collapse all files

10
synapse/handlers/presence.py
View file

@ -383,7 +383,7 @@ class PresenceHandler(BaseHandler):
logger.debug("Start polling for presence from %s", user)
if target_user:
target_users = set(target_user)
target_users = set([target_user])
else:
presence = yield self.store.get_presence_list(
user.localpart, accepted=True
@ -463,9 +463,13 @@ class PresenceHandler(BaseHandler):
deferreds = []
if target_user:
raise NotImplementedError("TODO: remove one user")
if target_user not in self._remote_recvmap:
return
target_users = set([target_user])
else:
target_users = self._remote_recvmap.keys()
remoteusers = [u for u in self._remote_recvmap
remoteusers = [u for u in target_users
if user in self._remote_recvmap[u]]
remoteusers_by_domain = partition(remoteusers, lambda u: u.domain)