Remove PerformError from AdminEvacuateRoom

clientapi/routing/admin.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/matrix-org/dendrite/internal"
+	"github.com/matrix-org/dendrite/internal/eventutil"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/gomatrixserverlib/spec"
 	"github.com/matrix-org/util"
@@ -28,23 +29,23 @@ func AdminEvacuateRoom(req *http.Request, rsAPI roomserverAPI.ClientRoomserverAP
 	if err != nil {
 		return util.ErrorResponse(err)
 	}
-	res := &roomserverAPI.PerformAdminEvacuateRoomResponse{}
+
-	if err := rsAPI.PerformAdminEvacuateRoom(
+	affected, err := rsAPI.PerformAdminEvacuateRoom(req.Context(), vars["roomID"])
-		req.Context(),
+	switch err {
-		&roomserverAPI.PerformAdminEvacuateRoomRequest{
+	case nil:
-			RoomID: vars["roomID"],
+	case eventutil.ErrRoomNoExists:
-		},
+		return util.JSONResponse{
-		res,
+			Code: http.StatusNotFound,
-	); err != nil {
+			JSON: jsonerror.NotFound(err.Error()),
-		return util.ErrorResponse(err)
 		}
-	if err := res.Error; err != nil {
+	default:
-		return err.JSONResponse()
+		logrus.WithError(err).WithField("roomID", vars["roomID"]).Error("Failed to evacuate room")
+		return jsonerror.InternalServerError()
 	}
 	return util.JSONResponse{
 		Code: 200,
 		JSON: map[string]interface{}{
-			"affected": res.Affected,
+			"affected": affected,
 		},
 	}
 }

roomserver/api/api.go

@@ -151,7 +151,7 @@ type ClientRoomserverAPI interface {
 
 	// PerformRoomUpgrade upgrades a room to a newer version
 	PerformRoomUpgrade(ctx context.Context, req *PerformRoomUpgradeRequest, resp *PerformRoomUpgradeResponse) error
-	PerformAdminEvacuateRoom(ctx context.Context, req *PerformAdminEvacuateRoomRequest, res *PerformAdminEvacuateRoomResponse) error
+	PerformAdminEvacuateRoom(ctx context.Context, roomID string) (affected []string, err error)
 	PerformAdminEvacuateUser(ctx context.Context, req *PerformAdminEvacuateUserRequest, res *PerformAdminEvacuateUserResponse) error
 	PerformAdminPurgeRoom(ctx context.Context, req *PerformAdminPurgeRoomRequest, res *PerformAdminPurgeRoomResponse) error
 	PerformAdminDownloadState(ctx context.Context, req *PerformAdminDownloadStateRequest, res *PerformAdminDownloadStateResponse) error

roomserver/internal/perform/perform_admin.go

@@ -43,55 +43,34 @@ type Admin struct {
 // PerformEvacuateRoom will remove all local users from the given room.
 func (r *Admin) PerformAdminEvacuateRoom(
 	ctx context.Context,
-	req *api.PerformAdminEvacuateRoomRequest,
+	roomID string,
-	res *api.PerformAdminEvacuateRoomResponse,
+) (affected []string, err error) {
-) error {
+	roomInfo, err := r.DB.RoomInfo(ctx, roomID)
-	roomInfo, err := r.DB.RoomInfo(ctx, req.RoomID)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.RoomInfo: %s", err),
-		}
-		return nil
 	}
 	if roomInfo == nil || roomInfo.IsStub() {
-		res.Error = &api.PerformError{
+		return nil, eventutil.ErrRoomNoExists
-			Code: api.PerformErrorNoRoom,
-			Msg:  fmt.Sprintf("Room %s not found", req.RoomID),
-		}
-		return nil
 	}
 
 	memberNIDs, err := r.DB.GetMembershipEventNIDsForRoom(ctx, roomInfo.RoomNID, true, true)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.GetMembershipEventNIDsForRoom: %s", err),
-		}
-		return nil
 	}
 
 	memberEvents, err := r.DB.Events(ctx, roomInfo, memberNIDs)
 	if err != nil {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.DB.Events: %s", err),
-		}
-		return nil
 	}
 
 	inputEvents := make([]api.InputRoomEvent, 0, len(memberEvents))
-	res.Affected = make([]string, 0, len(memberEvents))
+	affected = make([]string, 0, len(memberEvents))
 	latestReq := &api.QueryLatestEventsAndStateRequest{
-		RoomID: req.RoomID,
+		RoomID: roomID,
 	}
 	latestRes := &api.QueryLatestEventsAndStateResponse{}
 	if err = r.Queryer.QueryLatestEventsAndState(ctx, latestReq, latestRes); err != nil {
-		res.Error = &api.PerformError{
+		return nil, err
-			Code: api.PerformErrorBadRequest,
-			Msg:  fmt.Sprintf("r.Queryer.QueryLatestEventsAndState: %s", err),
-		}
-		return nil
 	}
 
 	prevEvents := latestRes.LatestEvents
@@ -102,17 +81,13 @@ func (r *Admin) PerformAdminEvacuateRoom(
 
 		var memberContent gomatrixserverlib.MemberContent
 		if err = json.Unmarshal(memberEvent.Content(), &memberContent); err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("json.Unmarshal: %s", err),
-			}
-			return nil
 		}
 		memberContent.Membership = spec.Leave
 
 		stateKey := *memberEvent.StateKey()
 		fledglingEvent := &gomatrixserverlib.EventBuilder{
-			RoomID:     req.RoomID,
+			RoomID:     roomID,
 			Type:       spec.MRoomMember,
 			StateKey:   &stateKey,
 			Sender:     stateKey,
@@ -125,20 +100,12 @@ func (r *Admin) PerformAdminEvacuateRoom(
 		}
 
 		if fledglingEvent.Content, err = json.Marshal(memberContent); err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("json.Marshal: %s", err),
-			}
-			return nil
 		}
 
 		eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(fledglingEvent)
 		if err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("gomatrixserverlib.StateNeededForEventBuilder: %s", err),
-			}
-			return nil
 		}
 
 		identity, err := r.Cfg.Matrix.SigningIdentityFor(senderDomain)
@@ -148,11 +115,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
 
 		event, err := eventutil.BuildEvent(ctx, fledglingEvent, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, latestRes)
 		if err != nil {
-			res.Error = &api.PerformError{
+			return nil, err
-				Code: api.PerformErrorBadRequest,
-				Msg:  fmt.Sprintf("eventutil.BuildEvent: %s", err),
-			}
-			return nil
 		}
 
 		inputEvents = append(inputEvents, api.InputRoomEvent{
@@ -161,7 +124,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
 			Origin:       senderDomain,
 			SendAsServer: string(senderDomain),
 		})
-		res.Affected = append(res.Affected, stateKey)
+		affected = append(affected, stateKey)
 		prevEvents = []gomatrixserverlib.EventReference{
 			event.EventReference(),
 		}
@@ -172,7 +135,8 @@ func (r *Admin) PerformAdminEvacuateRoom(
 		Asynchronous:    true,
 	}
 	inputRes := &api.InputRoomEventsResponse{}
-	return r.Inputer.InputRoomEvents(ctx, inputReq, inputRes)
+	err = r.Inputer.InputRoomEvents(ctx, inputReq, inputRes)
+	return affected, err
 }
 
 func (r *Admin) PerformAdminEvacuateUser(