From 5eb20daf1545f1672ef3b01ea72f537b4e78a550 Mon Sep 17 00:00:00 2001 From: Sam Wedgwood Date: Mon, 7 Aug 2023 15:31:32 +0100 Subject: [PATCH] set yaml config key & fix validation logic --- setup/config/config_roomserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/config/config_roomserver.go b/setup/config/config_roomserver.go index 61534e011..6b7c55e09 100644 --- a/setup/config/config_roomserver.go +++ b/setup/config/config_roomserver.go @@ -10,7 +10,7 @@ import ( type RoomServer struct { Matrix *Global `yaml:"-"` - DefaultRoomVersion gomatrixserverlib.RoomVersion + DefaultRoomVersion gomatrixserverlib.RoomVersion `yaml:"default_room_version,omitempty"` Database DatabaseOptions `yaml:"database,omitempty"` } @@ -30,8 +30,8 @@ func (c *RoomServer) Verify(configErrs *ConfigErrors) { } if !gomatrixserverlib.KnownRoomVersion(c.DefaultRoomVersion) { - configErrs.Add(fmt.Sprintf("invalid value for config key 'room_server.default_room_version': unsupported default room version: %q", c.DefaultRoomVersion)) - } else if gomatrixserverlib.StableRoomVersion(c.DefaultRoomVersion) { + configErrs.Add(fmt.Sprintf("invalid value for config key 'room_server.default_room_version': unsupported room version: %q", c.DefaultRoomVersion)) + } else if !gomatrixserverlib.StableRoomVersion(c.DefaultRoomVersion) { log.Warnf("WARNING: Provided default room version %q is unstable", c.DefaultRoomVersion) } }