mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-18 04:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to determine room version for SendJoin

Browse source
This commit is contained in:
Neil Alexander 2020-03-12 17:52:52 +00:00
parent dc7028b3ab
commit 5bb15c1590
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
federationapi/routing/join.go
View file

@ -116,7 +116,16 @@ func SendJoin(
keys gomatrixserverlib.KeyRing, keys gomatrixserverlib.KeyRing,
roomID, eventID string, roomID, eventID string,
) util.JSONResponse { ) util.JSONResponse {
event, err := gomatrixserverlib.NewEventFromUntrustedJSON(request.Content()) vReq := api.QueryRoomVersionForRoomIDRequest{RoomID: roomID}
vRes := api.QueryRoomVersionForRoomIDResponse{}
if query.QueryRoomVersionForRoomID(httpReq.Context(), &vReq, &vRes) != nil {
return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.NotJSON("Couldn't determine the room version for this room."),
}
}
event, err := gomatrixserverlib.NewEventFromUntrustedJSON(request.Content(), vRes.RoomVersion)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,