From b2a53722e68560677e40aded4de4232d6a507237 Mon Sep 17 00:00:00 2001 From: MrMelon54 Date: Thu, 13 Jul 2023 00:16:47 +0100 Subject: [PATCH] Output slice of values --- servers/api/target.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/servers/api/target.go b/servers/api/target.go index 6508ac6..79be326 100644 --- a/servers/api/target.go +++ b/servers/api/target.go @@ -15,16 +15,13 @@ import ( func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router.Manager) { // Endpoint for routes r.GET("/route", checkAuthWithPerm(verify, "violet:route", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims) { - routes, active, err := manager.GetAllRoutes() + routes, err := manager.GetAllRoutes() if err != nil { apiError(rw, http.StatusInternalServerError, "Failed to get routes from database") return } rw.WriteHeader(http.StatusOK) - _ = json.NewEncoder(rw).Encode(map[string]any{ - "routes": routes, - "active": active, - }) + _ = json.NewEncoder(rw).Encode(routes) })) r.POST("/route", parseJsonAndCheckOwnership[routeSource](verify, "route", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims, t routeSource) { err := manager.InsertRoute(target.Route(t)) @@ -47,16 +44,13 @@ func SetupTargetApis(r *httprouter.Router, verify mjwt.Verifier, manager *router // Endpoint for redirects r.GET("/redirect", checkAuthWithPerm(verify, "violet:redirect", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims) { - redirects, active, err := manager.GetAllRedirects() + redirects, err := manager.GetAllRedirects() if err != nil { apiError(rw, http.StatusInternalServerError, "Failed to get redirects from database") return } rw.WriteHeader(http.StatusOK) - _ = json.NewEncoder(rw).Encode(map[string]any{ - "redirects": redirects, - "active": active, - }) + _ = json.NewEncoder(rw).Encode(redirects) })) r.POST("/redirect", parseJsonAndCheckOwnership[redirectSource](verify, "redirect", func(rw http.ResponseWriter, req *http.Request, params httprouter.Params, b AuthClaims, t redirectSource) { err := manager.InsertRedirect(target.Redirect(t))