mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-17 03:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Return incompatible room version error

Browse source
This commit is contained in:
Neil Alexander 2020-05-04 11:30:02 +01:00
parent 46c46f5532
commit 3b6a94f007
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/jsonerror/jsonerror.go
View file

@ -18,6 +18,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
) )
@ -124,6 +125,12 @@ func GuestAccessForbidden(msg string) *MatrixError {
return &MatrixError{"M_GUEST_ACCESS_FORBIDDEN", msg} return &MatrixError{"M_GUEST_ACCESS_FORBIDDEN", msg}
} }
// IncompatibleRoomVersion is an error which is returned when the client
// requests a room with a version that is unsupported.
func IncompatibleRoomVersion(roomVersion gomatrixserverlib.RoomVersion) *MatrixError {
return &MatrixError{"M_INCOMPATIBLE_ROOM_VERSION", string(roomVersion)}
}
// UnsupportedRoomVersion is an error which is returned when the client // UnsupportedRoomVersion is an error which is returned when the client
// requests a room with a version that is unsupported. // requests a room with a version that is unsupported.
func UnsupportedRoomVersion(msg string) *MatrixError { func UnsupportedRoomVersion(msg string) *MatrixError {

4
federationapi/routing/join.go
View file

@ -62,9 +62,7 @@ func MakeJoin(
if !remoteSupportsVersion { if !remoteSupportsVersion {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.UnsupportedRoomVersion( JSON: jsonerror.IncompatibleRoomVersion(verRes.RoomVersion),
fmt.Sprintf("Joining server does not support room version %s", verRes.RoomVersion),
),
} }
} }