From 505a189ce5985c7bab4e01728477a65f93c175c0 Mon Sep 17 00:00:00 2001 From: Tobias Gesellchen Date: Sat, 28 Mar 2026 22:40:33 +0100 Subject: [PATCH] Simplify route config --- cmd/soundtouch-service/main.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/cmd/soundtouch-service/main.go b/cmd/soundtouch-service/main.go index 1ad567f..4aa2f32 100644 --- a/cmd/soundtouch-service/main.go +++ b/cmd/soundtouch-service/main.go @@ -675,7 +675,7 @@ func setupRouter(server *handlers.Server) *chi.Mux { r.Post("/orion/v1/playback/station/{data}", server.HandleOrionPlayback) r.Get("/custom/v1/playback/{encodedURL}", server.HandleCustomPlayback) - streamingRoutes := func(r chi.Router) { + r.Route("/streaming", func(r chi.Router) { r.Get("/sourceproviders", server.HandleMargeSourceProviders) r.Post("/account", server.HandleMargeCreateAccount) r.Post("/account/login", server.HandleMargeLogin) @@ -701,9 +701,9 @@ func setupRouter(server *handlers.Server) *chi.Mux { r.Post("/usage", server.HandleUsageStats) r.Post("/error", server.HandleErrorStats) }) - } + }) - accountsRoutes := func(r chi.Router) { + r.Route("/accounts", func(r chi.Router) { r.Get("/{account}/full", server.HandleMargeAccountFull) r.Get("/{account}/devices/{device}/presets", server.HandleMargePresets) r.Post("/{account}/devices/{device}/presets/{presetNumber}", server.HandleMargeUpdatePreset) @@ -715,18 +715,8 @@ func setupRouter(server *handlers.Server) *chi.Mux { r.Get("/{account}/devices/{device}/group/", server.HandleMargeDeviceGroup) r.Get("/{account}/devices/{device}/group/server", server.HandleMargeDeviceGroupServer) r.Get("/{account}/devices/{device}/group/member", server.HandleMargeDeviceGroupMember) - } - - r.Route("/marge", func(r chi.Router) { - r.Route("/streaming", streamingRoutes) - r.Route("/accounts", accountsRoutes) - - r.Get("/updates/soundtouch", server.HandleMargeSoftwareUpdate) }) - // Legacy or direct domain calls without /marge prefix - r.Route("/streaming", streamingRoutes) - r.Route("/accounts", accountsRoutes) r.Get("/updates/soundtouch", server.HandleMargeSoftwareUpdate) r.Route("/customer", func(r chi.Router) {