diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-05 14:28:03 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-05 14:28:03 +0000 |
| commit | 951690e54d5673431abefafc30c94af6e11341e3 (patch) | |
| tree | 779471113f16dfbf7e67504731dd412101eee180 /synapse/handlers/directory.py | |
| parent | Fix user query checks. HS>AS pushing now works. (diff) | |
| parent | Merge branch 'federation_client_retries' of github.com:matrix-org/synapse int... (diff) | |
| download | synapse-951690e54d5673431abefafc30c94af6e11341e3.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 000bf5793c..24ea3573d3 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -120,7 +120,16 @@ class DirectoryHandler(BaseHandler): ) extra_servers = yield self.store.get_joined_hosts_for_room(room_id) - servers = list(set(extra_servers) | set(servers)) + servers = set(extra_servers) | set(servers) + + # If this server is in the list of servers, return it first. + if self.server_name in servers: + servers = ( + [self.server_name] + + [s for s in servers if s != self.server_name] + ) + else: + servers = list(servers) defer.returnValue({ "room_id": room_id, |