diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-30 10:50:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-30 10:50:37 +0100 |
| commit | 55fc17cf4bdc550ece6feb5d4e5bdf10ab452010 (patch) | |
| tree | 16ba7b22e28eedcb4e42043e1487c285fc89546a /synapse/federation | |
| parent | Merge pull request #1050 from matrix-org/erikj/fix_device_sync (diff) | |
| parent | Add to slave store (diff) | |
| download | synapse-55fc17cf4bdc550ece6feb5d4e5bdf10ab452010.tar.xz | |
Merge pull request #1049 from matrix-org/erikj/presence_users_in_room
Use state handler instead of get_users_in_room/get_joined_hosts
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_client.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py index f2b3aceb49..67ad3dfd37 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py @@ -29,6 +29,7 @@ from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.logutils import log_function from synapse.util.logcontext import preserve_fn, preserve_context_over_deferred from synapse.events import FrozenEvent +from synapse.types import get_domain_from_id import synapse.metrics from synapse.util.retryutils import get_retry_limiter, NotRetryingDestination @@ -63,6 +64,7 @@ class FederationClient(FederationBase): self._clock.looping_call( self._clear_tried_cache, 60 * 1000, ) + self.state = hs.get_state_handler() def _clear_tried_cache(self): """Clear pdu_destination_tried cache""" @@ -811,7 +813,8 @@ class FederationClient(FederationBase): if len(signed_events) >= limit: defer.returnValue(signed_events) - servers = yield self.store.get_joined_hosts_for_room(room_id) + users = yield self.state.get_current_user_in_room(room_id) + servers = set(get_domain_from_id(u) for u in users) servers = set(servers) servers.discard(self.server_name) |