From 99e8e200390a3d3113594d083267ede7508f9ec5 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 3 May 2022 16:52:11 +0100
Subject: [PATCH] Simplify sync API `AddPublicRoutes`

---
 cmd/dendrite-polylith-multi/personalities/syncapi.go |  4 ++--
 setup/monolith.go                                    |  3 +--
 syncapi/syncapi.go                                   | 11 ++++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cmd/dendrite-polylith-multi/personalities/syncapi.go b/cmd/dendrite-polylith-multi/personalities/syncapi.go
index f9f1c5a09..2245b9b54 100644
--- a/cmd/dendrite-polylith-multi/personalities/syncapi.go
+++ b/cmd/dendrite-polylith-multi/personalities/syncapi.go
@@ -28,9 +28,9 @@ func SyncAPI(base *basepkg.BaseDendrite, cfg *config.Dendrite) {
 
 	syncapi.AddPublicRoutes(
 		base,
-		base.PublicClientAPIMux, userAPI, rsAPI,
+		userAPI, rsAPI,
 		base.KeyServerHTTPClient(),
-		federation, &cfg.SyncAPI,
+		federation,
 	)
 
 	base.SetupAndServeHTTP(
diff --git a/setup/monolith.go b/setup/monolith.go
index 5fe145f1c..a44f58e04 100644
--- a/setup/monolith.go
+++ b/setup/monolith.go
@@ -70,7 +70,6 @@ func (m *Monolith) AddAllPublicRoutes(base *base.BaseDendrite, csMux, ssMux, key
 		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,
 	)
 }
diff --git a/syncapi/syncapi.go b/syncapi/syncapi.go
index a2b8859cd..d8becb6ed 100644
--- a/syncapi/syncapi.go
+++ b/syncapi/syncapi.go
@@ -17,14 +17,12 @@ package syncapi
 import (
 	"context"
 
-	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/sirupsen/logrus"
 
 	keyapi "github.com/matrix-org/dendrite/keyserver/api"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/setup/base"
-	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/setup/jetstream"
 	userapi "github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/gomatrixserverlib"
@@ -42,13 +40,13 @@ import (
 // component.
 func AddPublicRoutes(
 	base *base.BaseDendrite,
-	router *mux.Router,
 	userAPI userapi.UserInternalAPI,
 	rsAPI api.RoomserverInternalAPI,
 	keyAPI keyapi.KeyInternalAPI,
 	federation *gomatrixserverlib.FederationClient,
-	cfg *config.SyncAPI,
 ) {
+	cfg := &base.Cfg.SyncAPI
+
 	js, natsClient := jetstream.Prepare(base.ProcessContext, &cfg.Matrix.JetStream)
 
 	syncDB, err := storage.NewSyncServerDatasource(base, &cfg.Database)
@@ -148,5 +146,8 @@ func AddPublicRoutes(
 		logrus.WithError(err).Panicf("failed to start presence consumer")
 	}
 
-	routing.Setup(router, requestPool, syncDB, userAPI, federation, rsAPI, cfg, lazyLoadCache)
+	routing.Setup(
+		base.PublicClientAPIMux, requestPool, syncDB, userAPI,
+		federation, rsAPI, cfg, lazyLoadCache,
+	)
 }