danvics/postmoogle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hotfix panic, fixes #36

Browse source
This commit is contained in:
Aine 2022-10-08 18:20:41 +03:00
parent 70ef60c934
commit c6049a7451
No known key found for this signature in database
GPG key ID: 34969C908CCA2804
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bot/access.go
View file

@ -5,6 +5,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/getsentry/sentry-go"
"github.com/raja/argon2pw" "github.com/raja/argon2pw"
"gitlab.com/etke.cc/go/mxidwc" "gitlab.com/etke.cc/go/mxidwc"
"maunium.net/go/mautrix/id" "maunium.net/go/mautrix/id"
@ -40,7 +41,7 @@ func (b *Bot) allowOwner(actorID id.UserID, targetRoomID id.RoomID) bool {
} }
cfg, err := b.getRoomSettings(targetRoomID) cfg, err := b.getRoomSettings(targetRoomID)
if err != nil { if err != nil {
b.Error(context.Background(), targetRoomID, "failed to retrieve settings: %v", err) b.Error(sentry.SetHubOnContext(context.Background(), sentry.CurrentHub()), targetRoomID, "failed to retrieve settings: %v", err)
return false return false
} }
@ -63,7 +64,7 @@ func (b *Bot) allowSend(actorID id.UserID, targetRoomID id.RoomID) bool {
cfg, err := b.getRoomSettings(targetRoomID) cfg, err := b.getRoomSettings(targetRoomID)
if err != nil { if err != nil {
b.Error(context.Background(), targetRoomID, "failed to retrieve settings: %v", err) b.Error(sentry.SetHubOnContext(context.Background(), sentry.CurrentHub()), targetRoomID, "failed to retrieve settings: %v", err)
return false return false
} }

3
bot/settings_bot.go
View file

@ -78,6 +78,9 @@ func (b *Bot) getBotSettings() botSettings {
if err != nil { if err != nil {
b.log.Error("cannot get bot settings: %v", utils.UnwrapError(err)) b.log.Error("cannot get bot settings: %v", utils.UnwrapError(err))
} }
if config == nil {
config = map[string]string{}
}
return config return config
} }