diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-05 15:01:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-05 15:01:33 +0100 |
| commit | 9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed (patch) | |
| tree | 87ea6eaf5acc72908c09f9a249129bc252eae14d /synapse/handlers/federation.py | |
| parent | Take value in a better way (diff) | |
| parent | Merge pull request #1070 from matrix-org/erikj/presence_stats (diff) | |
| download | synapse-9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
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( |