From 49d3000371c35e3092a8a5491c219f9acdeea470 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 26 Feb 2020 17:04:15 +0000 Subject: [PATCH] Use default room version correctly --- clientapi/routing/createroom.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go index 2b1245b9a..00e03bf44 100644 --- a/clientapi/routing/createroom.go +++ b/clientapi/routing/createroom.go @@ -18,11 +18,13 @@ import ( "encoding/json" "fmt" "net/http" + "strconv" "strings" "time" appserviceAPI "github.com/matrix-org/dendrite/appservice/api" roomserverAPI "github.com/matrix-org/dendrite/roomserver/api" + roomserverVersion "github.com/matrix-org/dendrite/roomserver/version" "github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/clientapi/auth/storage/accounts" @@ -180,7 +182,7 @@ func createRoom( } r.CreationContent["creator"] = userID - r.CreationContent["room_version"] = "1" // TODO: We set this to 1 before we support Room versioning + r.CreationContent["room_version"] = strconv.Itoa(roomserverVersion.GetDefaultRoomVersion()) // TODO: visibility/presets/raw initial state // TODO: Create room alias association