Merge branch 'main' into security

2022-10-10 09:49:36 +03:00
parent 6f4da59387 7a438bd761
commit 8c2ed1b496
6 changed files with 20 additions and 12 deletions
--- a/bot/settings_room.go
+++ b/bot/settings_room.go
@@ -120,6 +120,10 @@ func (s roomSettings) ContentOptions() *utils.ContentOptions {

 func (b *Bot) getRoomSettings(roomID id.RoomID) (roomSettings, error) {
 	config, err := b.lp.GetRoomAccountData(roomID, acRoomSettingsKey)
+	if config == nil {
+		config = map[string]string{}
+	}
+
 	return config, utils.UnwrapError(err)
 }