From 67b47d98bdb99b6b244f9bfc2fd572483a488902 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 23 Apr 2020 10:14:58 +0100 Subject: [PATCH] Improve the room version check --- federationapi/routing/invite.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go index cae92417d..d8518cbfe 100644 --- a/federationapi/routing/invite.go +++ b/federationapi/routing/invite.go @@ -22,7 +22,7 @@ import ( "github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/producers" "github.com/matrix-org/dendrite/common/config" - "github.com/matrix-org/dendrite/roomserver/version" + roomserverVersion "github.com/matrix-org/dendrite/roomserver/version" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" ) @@ -47,7 +47,8 @@ func Invite( event := inviteReq.Event() // Check if we support the room version for the invite. - if roomVersion, err := version.SupportedRoomVersion(inviteReq.RoomVersion()); err != nil { + roomVersion := inviteReq.RoomVersion() + if _, err := roomserverVersion.SupportedRoomVersion(roomVersion); err != nil { return util.JSONResponse{ Code: http.StatusBadRequest, JSON: jsonerror.UnsupportedRoomVersion(