From 76cceac63816eec71501e049eb55890661fdef47 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 30 Apr 2020 17:14:51 +0100 Subject: [PATCH] Roomserver didn't take asAPI param before so return to that --- cmd/dendrite-demo-libp2p/main.go | 2 +- cmd/dendrite-monolith-server/main.go | 2 +- cmd/dendrite-room-server/main.go | 3 +-- cmd/dendritejs/main.go | 2 +- roomserver/roomserver.go | 4 ---- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/cmd/dendrite-demo-libp2p/main.go b/cmd/dendrite-demo-libp2p/main.go index 4f639ca36..28c7153fd 100644 --- a/cmd/dendrite-demo-libp2p/main.go +++ b/cmd/dendrite-demo-libp2p/main.go @@ -149,7 +149,7 @@ func main() { keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives) rsAPI := roomserver.SetupRoomServerComponent( - &base.Base, keyRing, federation, nil, + &base.Base, keyRing, federation, ) eduInputAPI := eduserver.SetupEDUServerComponent( &base.Base, cache.New(), diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index ad346d37b..060019711 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -58,7 +58,7 @@ func main() { keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives) rsAPI := roomserver.SetupRoomServerComponent( - base, keyRing, federation, nil, // TODO: AS API here + base, keyRing, federation, ) eduInputAPI := eduserver.SetupEDUServerComponent( base, cache.New(), diff --git a/cmd/dendrite-room-server/main.go b/cmd/dendrite-room-server/main.go index 3de13c663..41149ad90 100644 --- a/cmd/dendrite-room-server/main.go +++ b/cmd/dendrite-room-server/main.go @@ -30,9 +30,8 @@ func main() { federation := base.CreateFederationClient() keyRing := keydb.CreateKeyRing(federation.Client, keyDB, cfg.Matrix.KeyPerspectives) - asAPI := base.CreateHTTPAppServiceAPIs() fsAPI := base.CreateHTTPFederationSenderAPIs() - rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation, asAPI) // TODO: AS API here + rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation) rsAPI.SetFederationSenderAPI(fsAPI) base.SetupAndServeHTTP(string(base.Cfg.Bind.RoomServer), string(base.Cfg.Listen.RoomServer)) diff --git a/cmd/dendritejs/main.go b/cmd/dendritejs/main.go index 9cd975ecf..5b7ed4807 100644 --- a/cmd/dendritejs/main.go +++ b/cmd/dendritejs/main.go @@ -123,7 +123,7 @@ func main() { } p2pPublicRoomProvider := NewLibP2PPublicRoomsProvider(node) - rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation, nil) // TODO: AS API here + rsAPI := roomserver.SetupRoomServerComponent(base, keyRing, federation) eduInputAPI := eduserver.SetupEDUServerComponent(base, cache.New()) asQuery := appservice.SetupAppServiceAPIComponent( base, accountDB, deviceDB, federation, rsAPI, transactions.New(), diff --git a/roomserver/roomserver.go b/roomserver/roomserver.go index 50a3bf802..916e25fbd 100644 --- a/roomserver/roomserver.go +++ b/roomserver/roomserver.go @@ -24,8 +24,6 @@ import ( "github.com/matrix-org/dendrite/roomserver/internal" "github.com/matrix-org/dendrite/roomserver/storage" "github.com/sirupsen/logrus" - - appserviceAPI "github.com/matrix-org/dendrite/appservice/api" ) // SetupRoomServerComponent sets up and registers HTTP handlers for the @@ -36,7 +34,6 @@ func SetupRoomServerComponent( base *basecomponent.BaseDendrite, keyRing gomatrixserverlib.JSONVerifier, fedClient *gomatrixserverlib.FederationClient, - asAPI appserviceAPI.AppServiceQueryAPI, ) api.RoomserverInternalAPI { roomserverDB, err := storage.Open(string(base.Cfg.Database.RoomServer)) if err != nil { @@ -52,7 +49,6 @@ func SetupRoomServerComponent( ServerName: base.Cfg.Matrix.ServerName, FedClient: fedClient, KeyRing: keyRing, - AppserviceAPI: asAPI, } internalAPI.SetupHTTP(http.DefaultServeMux)