diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-05 14:06:13 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-05 14:06:13 +0000 |
| commit | 4996398858c26b623d98320a60bd891c6c608418 (patch) | |
| tree | d1f0646f53488933de7b96055e8b302ccb2372d0 /synapse/handlers/directory.py | |
| parent | Merge pull request #47 from matrix-org/signature_failures (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into federation_clien... (diff) | |
| download | synapse-4996398858c26b623d98320a60bd891c6c608418.tar.xz | |
Merge branch 'federation_client_retries' of github.com:matrix-org/synapse into develop
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 58e9a91562..7b60921040 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -113,7 +113,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, |