Clean up a bit

federationsender/internal/perform.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 	"time"
 
 	"github.com/matrix-org/dendrite/federationsender/api"
@@ -116,12 +115,6 @@ func (r *FederationSenderInternalAPI) PerformJoin(
 		// Clear the wrapped error, else serialising to JSON (in polylith mode) will fail
 		httpErr.WrappedError = nil
 		response.LastError = &httpErr
-	} else if errors.Is(lastErr, &gomatrixserverlib.NotAllowed{}) {
-		response.LastError = &gomatrix.HTTPError{
-			Code:         http.StatusForbidden,
-			WrappedError: lastErr,
-			Message:      lastErr.Error(),
-		}
 	} else {
 		response.LastError = &gomatrix.HTTPError{
 			Code:         0,

roomserver/internal/input/input.go

@@ -214,7 +214,8 @@ func (r *Inputer) InputRoomEvents(
 	for _, task := range tasks {
 		if task.err != nil {
 			response.ErrMsg = task.err.Error()
-			_, response.NotAllowed = task.err.(*gomatrixserverlib.NotAllowed)
+			_, rejected := task.err.(*gomatrixserverlib.NotAllowed)
+			response.NotAllowed = rejected
 			return
 		}
 	}

roomserver/internal/perform/perform_join.go

@@ -25,7 +25,6 @@ import (
 	"github.com/getsentry/sentry-go"
 	fsAPI "github.com/matrix-org/dendrite/federationsender/api"
 	"github.com/matrix-org/dendrite/internal/eventutil"
-	"github.com/matrix-org/dendrite/roomserver/api"
 	rsAPI "github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/dendrite/roomserver/internal/helpers"
 	"github.com/matrix-org/dendrite/roomserver/internal/input"
@@ -61,8 +60,7 @@ func (r *Joiner) PerformJoin(
 			res.Error = perr
 		} else {
 			res.Error = &rsAPI.PerformError{
-				Code: api.PerformErrorNotAllowed, // TODO: fix this when cross-boundary handling is better.
-				Msg:  err.Error(),
+				Msg: err.Error(),
 			}
 		}
 	}
@@ -152,6 +150,7 @@ func (r *Joiner) performJoinRoomByAlias(
 	return r.performJoinRoomByID(ctx, req)
 }
 
+// TODO: Break this function up a bit
 // nolint:gocyclo
 func (r *Joiner) performJoinRoomByID(
 	ctx context.Context,

roomserver/version/version.go

@@ -23,7 +23,7 @@ import (
 // DefaultRoomVersion contains the room version that will, by
 // default, be used to create new rooms on this server.
 func DefaultRoomVersion() gomatrixserverlib.RoomVersion {
-	return gomatrixserverlib.RoomVersionV6
+	return gomatrixserverlib.RoomVersionV9
 }
 
 // RoomVersions returns a map of all known room versions to this