mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-09 07:03:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify media API AddPublicRoutes

Browse source
This commit is contained in:
Neil Alexander 2022-05-03 16:50:31 +01:00
parent 03a5fa39fe
commit 0c4f19fcb2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/dendrite-polylith-multi/personalities/mediaapi.go
View file

@ -25,8 +25,7 @@ func MediaAPI(base *basepkg.BaseDendrite, cfg *config.Dendrite) {
client := base.CreateClient()
mediaapi.AddPublicRoutes(
base, base.PublicMediaAPIMux, &base.Cfg.MediaAPI, &base.Cfg.ClientAPI.RateLimiting,
userAPI, client,
base, userAPI, client,
)
base.SetupAndServeHTTP(

10
mediaapi/mediaapi.go
View file

@ -15,11 +15,9 @@
package mediaapi
import (
"github.com/gorilla/mux"
"github.com/matrix-org/dendrite/mediaapi/routing"
"github.com/matrix-org/dendrite/mediaapi/storage"
"github.com/matrix-org/dendrite/setup/base"
"github.com/matrix-org/dendrite/setup/config"
userapi "github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/gomatrixserverlib"
"github.com/sirupsen/logrus"
@ -28,18 +26,18 @@ import (
// AddPublicRoutes sets up and registers HTTP handlers for the MediaAPI component.
func AddPublicRoutes(
base *base.BaseDendrite,
router *mux.Router,
cfg *config.MediaAPI,
rateLimit *config.RateLimiting,
userAPI userapi.UserInternalAPI,
client *gomatrixserverlib.Client,
) {
cfg := &base.Cfg.MediaAPI
rateCfg := &base.Cfg.ClientAPI.RateLimiting
mediaDB, err := storage.NewMediaAPIDatasource(base, &cfg.Database)
if err != nil {
logrus.WithError(err).Panicf("failed to connect to media db")
}
routing.Setup(
router, cfg, rateLimit, mediaDB, userAPI, client,
base.PublicMediaAPIMux, cfg, rateCfg, mediaDB, userAPI, client,
)
}

3
setup/monolith.go
View file

@ -67,8 +67,7 @@ func (m *Monolith) AddAllPublicRoutes(base *base.BaseDendrite, csMux, ssMux, key
m.KeyAPI, nil,
)
mediaapi.AddPublicRoutes(
base, mediaMux, &m.Config.MediaAPI, &m.Config.ClientAPI.RateLimiting,
m.UserAPI, m.Client,
base, m.UserAPI, m.Client,
)
syncapi.AddPublicRoutes(
base, csMux, m.UserAPI, m.RoomserverAPI,