mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-14 01:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check for IncompatibleRoomVersionError in make join response

Browse source
This commit is contained in:
Devon Hudson 2023-05-12 18:51:34 -06:00
parent f97152f479
commit faa0aa0744
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
federationapi/routing/join.go
View file

@ -172,14 +172,18 @@ func MakeJoin(
code = http.StatusBadRequest code = http.StatusBadRequest
case spec.ErrorBadJSON: case spec.ErrorBadJSON:
code = http.StatusBadRequest code = http.StatusBadRequest
case spec.ErrorIncompatibleRoomVersion:
code = http.StatusBadRequest
} }
return util.JSONResponse{ return util.JSONResponse{
Code: code, Code: code,
JSON: e, JSON: e,
} }
case spec.IncompatibleRoomVersionError:
util.GetLogger(httpReq.Context()).WithError(internalErr)
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: e,
}
default: default:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr)
return util.JSONResponse{ return util.JSONResponse{