From cb7100c556e17e59034815d6fb26532366840dae Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 2 Nov 2022 11:10:13 +0000 Subject: [PATCH] Fix oops --- roomserver/inthttp/client.go | 17 +---------------- roomserver/inthttp/server.go | 6 +++--- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/roomserver/inthttp/client.go b/roomserver/inthttp/client.go index 547131332..9a45dc63b 100644 --- a/roomserver/inthttp/client.go +++ b/roomserver/inthttp/client.go @@ -27,21 +27,6 @@ const ( RoomserverInputRoomEventsPath = "/roomserver/inputRoomEvents" // Perform operations -<<<<<<< HEAD - 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" - RoomserverPerformAdminEvacuateUserPath = "/roomserver/performAdminEvacuateUser" - RoomserverPerformAdminPurgeRoomPath = "/roomserver/performAdminPurgeRoom" -======= RoomserverPerformInvitePath = "/roomserver/performInvite" RoomserverPerformPeekPath = "/roomserver/performPeek" RoomserverPerformUnpeekPath = "/roomserver/performUnpeek" @@ -55,7 +40,7 @@ const ( RoomserverPerformAdminEvacuateRoomPath = "/roomserver/performAdminEvacuateRoom" RoomserverPerformAdminEvacuateUserPath = "/roomserver/performAdminEvacuateUser" RoomserverPerformAdminDownloadStatePath = "/roomserver/performAdminDownloadState" ->>>>>>> main + RoomserverPerformAdminPurgeRoomPath = "/roomserver/performAdminPurgeRoom" // Query operations RoomserverQueryLatestEventsAndStatePath = "/roomserver/queryLatestEventsAndState" diff --git a/roomserver/inthttp/server.go b/roomserver/inthttp/server.go index 40b11ce8e..f95a3105f 100644 --- a/roomserver/inthttp/server.go +++ b/roomserver/inthttp/server.go @@ -66,13 +66,13 @@ func AddRoutes(r api.RoomserverInternalAPI, internalAPIMux *mux.Router) { ) internalAPIMux.Handle( -<<<<<<< HEAD RoomserverPerformAdminPurgeRoomPath, httputil.MakeInternalRPCAPI("RoomserverPerformAdminPurgeRoom", r.PerformAdminPurgeRoom), -======= + ) + + internalAPIMux.Handle( RoomserverPerformAdminDownloadStatePath, httputil.MakeInternalRPCAPI("RoomserverPerformAdminDownloadState", r.PerformAdminDownloadState), ->>>>>>> main ) internalAPIMux.Handle(