diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-09-08 13:43:43 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-09-08 13:43:43 +0100 |
| commit | fa9d36e050d942e76b2bd6a6d2c190215a1dac39 (patch) | |
| tree | 806152a98d66013b94882c85cb1cb6129be62e78 /synapse/handlers/federation.py | |
| parent | Add a new method to enqueue the device messages rather than sending a dummy EDU (diff) | |
| parent | Log delta files we're applying (diff) | |
| download | synapse-fa9d36e050d942e76b2bd6a6d2c190215a1dac39.tar.xz | |
Merge branch 'develop' into markjh/direct_to_device_federation
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index dc90a5dde4..8a1038c44a 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -832,11 +832,13 @@ class FederationHandler(BaseHandler): new_pdu = event - message_handler = self.hs.get_handlers().message_handler - destinations = yield message_handler.get_joined_hosts_for_room_from_state( - context + users_in_room = yield self.store.get_joined_users_from_context(event, context) + + destinations = set( + get_domain_from_id(user_id) for user_id in users_in_room + if not self.hs.is_mine_id(user_id) ) - destinations = set(destinations) + destinations.discard(origin) logger.debug( @@ -1055,11 +1057,12 @@ class FederationHandler(BaseHandler): new_pdu = event - message_handler = self.hs.get_handlers().message_handler - destinations = yield message_handler.get_joined_hosts_for_room_from_state( - context + users_in_room = yield self.store.get_joined_users_from_context(event, context) + + destinations = set( + get_domain_from_id(user_id) for user_id in users_in_room + if not self.hs.is_mine_id(user_id) ) - destinations = set(destinations) destinations.discard(origin) logger.debug( |