Remove PerformError from room publishing

clientapi/routing/createroom.go

@@ -587,18 +587,14 @@ func createRoom(
 		}
 	}
 
-	if r.Visibility == "public" {
+	if r.Visibility == spec.Public {
 		// expose this room in the published room list
-		var pubRes roomserverAPI.PerformPublishResponse
+		if err = rsAPI.PerformPublish(ctx, &roomserverAPI.PerformPublishRequest{
-		if err := rsAPI.PerformPublish(ctx, &roomserverAPI.PerformPublishRequest{
 			RoomID:     roomID,
-			Visibility: "public",
+			Visibility: spec.Public,
-		}, &pubRes); err != nil {
+		}); err != nil {
-			return jsonerror.InternalAPIError(ctx, err)
+			util.GetLogger(ctx).WithError(err).Error("failed to publish room")
-		}
+			return jsonerror.InternalServerError()
-		if pubRes.Error != nil {
-			// treat as non-fatal since the room is already made by this point
-			util.GetLogger(ctx).WithError(pubRes.Error).Error("failed to visibility:public")
 		}
 	}
 

clientapi/routing/directory.go

@@ -304,16 +304,12 @@ func SetVisibility(
 		return *reqErr
 	}
 
-	var publishRes roomserverAPI.PerformPublishResponse
+	if err = rsAPI.PerformPublish(req.Context(), &roomserverAPI.PerformPublishRequest{
-	if err := rsAPI.PerformPublish(req.Context(), &roomserverAPI.PerformPublishRequest{
 		RoomID:     roomID,
 		Visibility: v.Visibility,
-	}, &publishRes); err != nil {
+	}); err != nil {
-		return jsonerror.InternalAPIError(req.Context(), err)
+		util.GetLogger(req.Context()).WithError(err).Error("failed to publish room")
-	}
+		return jsonerror.InternalServerError()
-	if publishRes.Error != nil {
-		util.GetLogger(req.Context()).WithError(publishRes.Error).Error("PerformPublish failed")
-		return publishRes.Error.JSONResponse()
 	}
 
 	return util.JSONResponse{
@@ -342,18 +338,14 @@ func SetVisibilityAS(
 			return *reqErr
 		}
 	}
-	var publishRes roomserverAPI.PerformPublishResponse
 	if err := rsAPI.PerformPublish(req.Context(), &roomserverAPI.PerformPublishRequest{
 		RoomID:       roomID,
 		Visibility:   v.Visibility,
 		NetworkID:    networkID,
 		AppserviceID: dev.AppserviceID,
-	}, &publishRes); err != nil {
+	}); err != nil {
-		return jsonerror.InternalAPIError(req.Context(), err)
+		util.GetLogger(req.Context()).WithError(err).Error("failed to publish room")
-	}
+		return jsonerror.InternalServerError()
-	if publishRes.Error != nil {
-		util.GetLogger(req.Context()).WithError(publishRes.Error).Error("PerformPublish failed")
-		return publishRes.Error.JSONResponse()
 	}
 
 	return util.JSONResponse{

roomserver/api/api.go

@@ -179,7 +179,7 @@ type ClientRoomserverAPI interface {
 	PerformInvite(ctx context.Context, req *PerformInviteRequest) error
 	PerformJoin(ctx context.Context, req *PerformJoinRequest) (roomID string, joinedVia spec.ServerName, err error)
 	PerformLeave(ctx context.Context, req *PerformLeaveRequest, res *PerformLeaveResponse) error
-	PerformPublish(ctx context.Context, req *PerformPublishRequest, res *PerformPublishResponse) error
+	PerformPublish(ctx context.Context, req *PerformPublishRequest) error
 	// PerformForget forgets a rooms history for a specific user
 	PerformForget(ctx context.Context, req *PerformForgetRequest, resp *PerformForgetResponse) error
 	SetRoomAlias(ctx context.Context, req *SetRoomAliasRequest, res *SetRoomAliasResponse) error

roomserver/api/perform.go

@@ -121,11 +121,6 @@ type PerformPublishRequest struct {
 	NetworkID    string
 }
 
-type PerformPublishResponse struct {
-	// If non-nil, the publish request failed. Contains more information why it failed.
-	Error *PerformError
-}
-
 type PerformInboundPeekRequest struct {
 	UserID          string          `json:"user_id"`
 	RoomID          string          `json:"room_id"`

roomserver/internal/perform/perform_publish.go

@@ -25,16 +25,10 @@ type Publisher struct {
 	DB storage.Database
 }
 
+// PerformPublish publishes or unpublishes a room from the room directory. Returns a database error, if any.
 func (r *Publisher) PerformPublish(
 	ctx context.Context,
 	req *api.PerformPublishRequest,
-	res *api.PerformPublishResponse,
 ) error {
-	err := r.DB.PublishRoom(ctx, req.RoomID, req.AppserviceID, req.NetworkID, req.Visibility == "public")
+	return r.DB.PublishRoom(ctx, req.RoomID, req.AppserviceID, req.NetworkID, req.Visibility == "public")
-	if err != nil {
-		res.Error = &api.PerformError{
-			Msg: err.Error(),
-		}
-	}
-	return nil
 }

roomserver/internal/perform/perform_upgrade.go

@@ -294,27 +294,21 @@ func publishNewRoomAndUnpublishOldRoom(
 	oldRoomID, newRoomID string,
 ) {
 	// expose this room in the published room list
-	var pubNewRoomRes api.PerformPublishResponse
 	if err := URSAPI.PerformPublish(ctx, &api.PerformPublishRequest{
 		RoomID:     newRoomID,
-		Visibility: "public",
+		Visibility: spec.Public,
-	}, &pubNewRoomRes); err != nil {
+	}); err != nil {
-		util.GetLogger(ctx).WithError(err).Error("failed to reach internal API")
-	} else if pubNewRoomRes.Error != nil {
 		// treat as non-fatal since the room is already made by this point
-		util.GetLogger(ctx).WithError(pubNewRoomRes.Error).Error("failed to visibility:public")
+		util.GetLogger(ctx).WithError(err).Error("failed to publish room")
 	}
 
-	var unpubOldRoomRes api.PerformPublishResponse
 	// remove the old room from the published room list
 	if err := URSAPI.PerformPublish(ctx, &api.PerformPublishRequest{
 		RoomID:     oldRoomID,
 		Visibility: "private",
-	}, &unpubOldRoomRes); err != nil {
+	}); err != nil {
-		util.GetLogger(ctx).WithError(err).Error("failed to reach internal API")
-	} else if unpubOldRoomRes.Error != nil {
 		// treat as non-fatal since the room is already made by this point
-		util.GetLogger(ctx).WithError(unpubOldRoomRes.Error).Error("failed to visibility:private")
+		util.GetLogger(ctx).WithError(err).Error("failed to un-publish room")
 	}
 }
 

roomserver/roomserver_test.go

@@ -251,13 +251,9 @@ func TestPurgeRoom(t *testing.T) {
 		}
 
 		// some dummy entries to validate after purging
-		publishResp := &api.PerformPublishResponse{}
+		if err = rsAPI.PerformPublish(ctx, &api.PerformPublishRequest{RoomID: room.ID, Visibility: spec.Public}); err != nil {
-		if err = rsAPI.PerformPublish(ctx, &api.PerformPublishRequest{RoomID: room.ID, Visibility: "public"}, publishResp); err != nil {
 			t.Fatal(err)
 		}
-		if publishResp.Error != nil {
-			t.Fatal(publishResp.Error)
-		}
 
 		isPublished, err := db.GetPublishedRoom(ctx, room.ID)
 		if err != nil {

roomserver/storage/interface.go

@@ -139,7 +139,7 @@ type Database interface {
 	// not found.
 	// Returns an error if the retrieval went wrong.
 	EventsFromIDs(ctx context.Context, roomInfo *types.RoomInfo, eventIDs []string) ([]types.Event, error)
-	// Publish or unpublish a room from the room directory.
+	// PerformPublish publishes or unpublishes a room from the room directory. Returns a database error, if any.
 	PublishRoom(ctx context.Context, roomID, appserviceID, networkID string, publish bool) error
 	// Returns a list of room IDs for rooms which are published.
 	GetPublishedRooms(ctx context.Context, networkID string, includeAllNetworks bool) ([]string, error)