From c2f7c80872543851419a55468e829a5a416f4d5a Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 3 Dec 2020 11:16:42 +0000 Subject: [PATCH] Fix build again --- federationapi/routing/peek.go | 2 +- roomserver/inthttp/server.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/federationapi/routing/peek.go b/federationapi/routing/peek.go index f3b3fd382..a036234ef 100644 --- a/federationapi/routing/peek.go +++ b/federationapi/routing/peek.go @@ -18,7 +18,7 @@ import ( "net/http" "github.com/matrix-org/dendrite/clientapi/jsonerror" - "github.com/matrix-org/dendrite/internal/config" + "github.com/matrix-org/dendrite/setup/config" "github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" diff --git a/roomserver/inthttp/server.go b/roomserver/inthttp/server.go index cc476f1b1..b42938401 100644 --- a/roomserver/inthttp/server.go +++ b/roomserver/inthttp/server.go @@ -82,6 +82,9 @@ func AddRoutes(r api.RoomserverInternalAPI, internalAPIMux *mux.Router) { if err := r.PerformInboundPeek(req.Context(), &request, &response); err != nil { return util.ErrorResponse(err) } + return util.JSONResponse{Code: http.StatusOK, JSON: &response} + }), + ) internalAPIMux.Handle(RoomserverPerformPeekPath, httputil.MakeInternalAPI("performUnpeek", func(req *http.Request) util.JSONResponse { var request api.PerformUnpeekRequest