diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2019-12-20 13:24:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 13:24:57 +0000 |
| commit | b4d638cd04d64bf574d8af75fc22efb72b4a0798 (patch) | |
| tree | cb43a24fd4cc4117b30e6bb77a120c8901a56742 /cmd | |
| parent | 24ac66cffdfbc3685f03c7286e210e1bbcc40918 (diff) | |
Return server names (#833)
* Remove unnecessary map->array processing
* Return server names in room federation directory query
* Knock off a TODO
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dendrite-federation-api-server/main.go | 3 | ||||
| -rw-r--r-- | cmd/dendrite-monolith-server/main.go | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/dendrite-federation-api-server/main.go b/cmd/dendrite-federation-api-server/main.go index c83845d2..367f5dc0 100644 --- a/cmd/dendrite-federation-api-server/main.go +++ b/cmd/dendrite-federation-api-server/main.go @@ -29,6 +29,7 @@ func main() { deviceDB := base.CreateDeviceDB() keyDB := base.CreateKeyDB() federation := base.CreateFederationClient() + federationSender := base.CreateHTTPFederationSenderAPIs() keyRing := keydb.CreateKeyRing(federation.Client, keyDB) alias, input, query := base.CreateHTTPRoomserverAPIs() @@ -36,7 +37,7 @@ func main() { federationapi.SetupFederationAPIComponent( base, accountDB, deviceDB, federation, &keyRing, - alias, input, query, asQuery, + alias, input, query, asQuery, federationSender, ) base.SetupAndServeHTTP(string(base.Cfg.Bind.FederationAPI), string(base.Cfg.Listen.FederationAPI)) diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index 0a320616..5ea6b154 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -67,7 +67,7 @@ func main() { federation, &keyRing, alias, input, query, typingInputAPI, asQuery, transactions.New(), fedSenderAPI, ) - federationapi.SetupFederationAPIComponent(base, accountDB, deviceDB, federation, &keyRing, alias, input, query, asQuery) + federationapi.SetupFederationAPIComponent(base, accountDB, deviceDB, federation, &keyRing, alias, input, query, asQuery, fedSenderAPI) mediaapi.SetupMediaAPIComponent(base, deviceDB) publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB) syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query) |