From 8e5a734b0a6c23bb9aec1d685838a372e7b300d4 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 16 Jun 2020 14:16:19 +0100 Subject: [PATCH] User API --- cmd/dendrite-media-api-server/main.go | 4 ++-- internal/setup/monolith.go | 2 +- mediaapi/mediaapi.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/dendrite-media-api-server/main.go b/cmd/dendrite-media-api-server/main.go index d4d26125e..1582a33a8 100644 --- a/cmd/dendrite-media-api-server/main.go +++ b/cmd/dendrite-media-api-server/main.go @@ -25,10 +25,10 @@ func main() { base := setup.NewBaseDendrite(cfg, "MediaAPI", true) defer base.Close() // nolint: errcheck - deviceDB := base.CreateDeviceDB() + userAPI := base.UserAPIClient() client := gomatrixserverlib.NewClient() - mediaapi.AddPublicRoutes(base.PublicAPIMux, base.Cfg, deviceDB, client) + mediaapi.AddPublicRoutes(base.PublicAPIMux, base.Cfg, userAPI, client) base.SetupAndServeHTTP(string(base.Cfg.Bind.MediaAPI), string(base.Cfg.Listen.MediaAPI)) diff --git a/internal/setup/monolith.go b/internal/setup/monolith.go index 58d690b28..b202aa71a 100644 --- a/internal/setup/monolith.go +++ b/internal/setup/monolith.go @@ -81,7 +81,7 @@ func (m *Monolith) AddAllPublicRoutes(publicMux *mux.Router) { m.KeyRing, m.RoomserverAPI, m.AppserviceAPI, m.FederationSenderAPI, m.EDUInternalAPI, ) - mediaapi.AddPublicRoutes(publicMux, m.Config, m.DeviceDB, m.Client) + mediaapi.AddPublicRoutes(publicMux, m.Config, m.UserAPI, m.Client) publicroomsapi.AddPublicRoutes( publicMux, m.Config, m.KafkaConsumer, m.UserAPI, m.PublicRoomsDB, m.RoomserverAPI, m.FedClient, m.ExtPublicRoomsProvider, diff --git a/mediaapi/mediaapi.go b/mediaapi/mediaapi.go index 3bf0a161d..290ef46e1 100644 --- a/mediaapi/mediaapi.go +++ b/mediaapi/mediaapi.go @@ -27,8 +27,8 @@ import ( // AddPublicRoutes sets up and registers HTTP handlers for the MediaAPI component. func AddPublicRoutes( router *mux.Router, cfg *config.Dendrite, - userAPI userapi.UserInternalAPI, - client *gomatrixserverlib.Client, + userAPI userapi.UserInternalAPI, + client *gomatrixserverlib.Client, ) { mediaDB, err := storage.Open(string(cfg.Database.MediaAPI), cfg.DbProperties()) if err != nil { @@ -36,6 +36,6 @@ func AddPublicRoutes( } routing.Setup( - router, cfg, mediaDB, deviceDB, client, + router, cfg, mediaDB, userAPI, client, ) }