Make sure getSettings() always returns settings or error
This commit is contained in:
@@ -22,7 +22,7 @@ func (b *Bot) getOwner(ctx context.Context, evt *event.Event) {
|
||||
defer span.Finish()
|
||||
|
||||
cfg, err := b.getSettings(span.Context(), evt.RoomID)
|
||||
if err != nil || cfg == nil {
|
||||
if err != nil {
|
||||
b.Error(span.Context(), evt.RoomID, "owner is not set yet")
|
||||
return
|
||||
}
|
||||
@@ -49,9 +49,6 @@ func (b *Bot) setOwner(ctx context.Context, evt *event.Event, owner string) {
|
||||
if err != nil {
|
||||
b.log.Warn("cannot get settings: %v", err)
|
||||
}
|
||||
if cfg == nil {
|
||||
cfg = &settings{}
|
||||
}
|
||||
|
||||
if !cfg.Allowed(b.noowner, evt.Sender) {
|
||||
b.Error(span.Context(), evt.RoomID, "you don't have permission to do that")
|
||||
|
||||
Reference in New Issue
Block a user