From 4a4788acd1530003e41e40c8cd7e66110ef906b1 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 28 Apr 2022 16:02:13 +0100 Subject: [PATCH] Add missing `Path` to name --- roomserver/inthttp/client.go | 24 ++++++++++++------------ roomserver/inthttp/server.go | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/roomserver/inthttp/client.go b/roomserver/inthttp/client.go index a45fab827..3b29001e9 100644 --- a/roomserver/inthttp/client.go +++ b/roomserver/inthttp/client.go @@ -29,17 +29,17 @@ const ( RoomserverInputRoomEventsPath = "/roomserver/inputRoomEvents" // Perform operations - RoomserverPerformInvitePath = "/roomserver/performInvite" - RoomserverPerformPeekPath = "/roomserver/performPeek" - RoomserverPerformUnpeekPath = "/roomserver/performUnpeek" - RoomserverPerformRoomUpgradePath = "/roomserver/performRoomUpgrade" - RoomserverPerformJoinPath = "/roomserver/performJoin" - RoomserverPerformLeavePath = "/roomserver/performLeave" - RoomserverPerformBackfillPath = "/roomserver/performBackfill" - RoomserverPerformPublishPath = "/roomserver/performPublish" - RoomserverPerformInboundPeekPath = "/roomserver/performInboundPeek" - RoomserverPerformForgetPath = "/roomserver/performForget" - RoomserverPerformAdminEvacuateRoom = "/roomserver/performAdminEvacuateRoom" + RoomserverPerformInvitePath = "/roomserver/performInvite" + RoomserverPerformPeekPath = "/roomserver/performPeek" + RoomserverPerformUnpeekPath = "/roomserver/performUnpeek" + RoomserverPerformRoomUpgradePath = "/roomserver/performRoomUpgrade" + RoomserverPerformJoinPath = "/roomserver/performJoin" + RoomserverPerformLeavePath = "/roomserver/performLeave" + RoomserverPerformBackfillPath = "/roomserver/performBackfill" + RoomserverPerformPublishPath = "/roomserver/performPublish" + RoomserverPerformInboundPeekPath = "/roomserver/performInboundPeek" + RoomserverPerformForgetPath = "/roomserver/performForget" + RoomserverPerformAdminEvacuateRoomPath = "/roomserver/performAdminEvacuateRoom" // Query operations RoomserverQueryLatestEventsAndStatePath = "/roomserver/queryLatestEventsAndState" @@ -308,7 +308,7 @@ func (h *httpRoomserverInternalAPI) PerformAdminEvacuateRoom( span, ctx := opentracing.StartSpanFromContext(ctx, "PerformAdminEvacuateRoom") defer span.Finish() - apiURL := h.roomserverURL + RoomserverPerformAdminEvacuateRoom + apiURL := h.roomserverURL + RoomserverPerformAdminEvacuateRoomPath err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, req, res) if err != nil { res.Error = &api.PerformError{ diff --git a/roomserver/inthttp/server.go b/roomserver/inthttp/server.go index 80076597e..c5159a63c 100644 --- a/roomserver/inthttp/server.go +++ b/roomserver/inthttp/server.go @@ -118,7 +118,7 @@ func AddRoutes(r api.RoomserverInternalAPI, internalAPIMux *mux.Router) { return util.JSONResponse{Code: http.StatusOK, JSON: &response} }), ) - internalAPIMux.Handle(RoomserverPerformAdminEvacuateRoom, + internalAPIMux.Handle(RoomserverPerformAdminEvacuateRoomPath, httputil.MakeInternalAPI("performAdminEvacuateRoom", func(req *http.Request) util.JSONResponse { var request api.PerformAdminEvacuateRoomRequest var response api.PerformAdminEvacuateRoomResponse