aboutsummaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2022-05-03 17:17:02 +0100
committerGitHub <noreply@github.com>2022-05-03 17:17:02 +0100
commitdd061a172e97005a4a7a4c37db6caf3f77c10d51 (patch)
tree6603b4825a7c5c335b8b9041339ed2ddd7d91c56 /setup
parent4ad5f9c982fe5dc9e306a9269621ead8c31248cf (diff)
Tidy up `AddPublicRoutes` (#2412)
* Simplify federation API `AddPublicRoutes` * Simplify client API `AddPublicRoutes` * Simplify media API `AddPublicRoutes` * Simplify sync API `AddPublicRoutes` * Simplify `AddAllPublicRoutes`
Diffstat (limited to 'setup')
-rw-r--r--setup/monolith.go19
1 files changed, 7 insertions, 12 deletions
diff --git a/setup/monolith.go b/setup/monolith.go
index a414172c..23bd2fb5 100644
--- a/setup/monolith.go
+++ b/setup/monolith.go
@@ -15,7 +15,6 @@
package setup
import (
- "github.com/gorilla/mux"
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
"github.com/matrix-org/dendrite/clientapi"
"github.com/matrix-org/dendrite/clientapi/api"
@@ -52,28 +51,24 @@ type Monolith struct {
}
// AddAllPublicRoutes attaches all public paths to the given router
-func (m *Monolith) AddAllPublicRoutes(base *base.BaseDendrite, csMux, ssMux, keyMux, wkMux, mediaMux, synapseMux, dendriteMux *mux.Router) {
+func (m *Monolith) AddAllPublicRoutes(base *base.BaseDendrite) {
userDirectoryProvider := m.ExtUserDirectoryProvider
if userDirectoryProvider == nil {
userDirectoryProvider = m.UserAPI
}
clientapi.AddPublicRoutes(
- base.ProcessContext, csMux, synapseMux, dendriteMux, &m.Config.ClientAPI,
- m.FedClient, m.RoomserverAPI, m.AppserviceAPI, transactions.New(),
+ base, m.FedClient, m.RoomserverAPI, m.AppserviceAPI, transactions.New(),
m.FederationAPI, m.UserAPI, userDirectoryProvider, m.KeyAPI,
- m.ExtPublicRoomsProvider, &m.Config.MSCs,
+ m.ExtPublicRoomsProvider,
)
federationapi.AddPublicRoutes(
- base.ProcessContext, ssMux, keyMux, wkMux, &m.Config.FederationAPI,
- m.UserAPI, m.FedClient, m.KeyRing, m.RoomserverAPI, m.FederationAPI,
- m.KeyAPI, &m.Config.MSCs, nil,
+ base, m.UserAPI, m.FedClient, m.KeyRing, m.RoomserverAPI, m.FederationAPI,
+ 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,
- m.KeyAPI, m.FedClient, &m.Config.SyncAPI,
+ base, m.UserAPI, m.RoomserverAPI, m.KeyAPI, m.FedClient,
)
}