From b79a728967092a084ea70c92b1f2814dd9b8625c Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 23 Aug 2022 17:51:34 +0300 Subject: [PATCH] Use notice instead of error for expected "errors" Notice() is like Error(), but: - the message is not sent to the error log (and Sentry) - the message sent to the room is not prefixed with `ERROR: ` --- bot/bot.go | 8 ++++++++ bot/mailbox.go | 4 ++-- bot/owner.go | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bot/bot.go b/bot/bot.go index c232766..8b2daaa 100644 --- a/bot/bot.go +++ b/bot/bot.go @@ -59,6 +59,14 @@ func (b *Bot) Error(ctx context.Context, roomID id.RoomID, message string, args } } +// Notice sends a notice message to the matrix room +func (b *Bot) Notice(ctx context.Context, roomID id.RoomID, message string, args ...interface{}) { + b.lp.Send(roomID, &event.MessageEventContent{ + MsgType: event.MsgNotice, + Body: fmt.Sprintf(message, args...), + }) +} + // Start performs matrix /sync func (b *Bot) Start() error { if err := b.migrate(); err != nil { diff --git a/bot/mailbox.go b/bot/mailbox.go index 87d2e7f..d74a71e 100644 --- a/bot/mailbox.go +++ b/bot/mailbox.go @@ -54,7 +54,7 @@ func (b *Bot) getMailbox(ctx context.Context, evt *event.Event) { } if cfg.Mailbox == "" { - b.Error(span.Context(), evt.RoomID, "mailbox name is not set") + b.Notice(span.Context(), evt.RoomID, "mailbox name is not set") return } @@ -87,7 +87,7 @@ func (b *Bot) setMailbox(ctx context.Context, evt *event.Event, mailbox string) } if !cfg.Allowed(b.noowner, evt.Sender) { - b.Error(span.Context(), evt.RoomID, "you don't have permission to do that") + b.Notice(span.Context(), evt.RoomID, "you don't have permission to do that") return } diff --git a/bot/owner.go b/bot/owner.go index a412d21..dc9c805 100644 --- a/bot/owner.go +++ b/bot/owner.go @@ -28,7 +28,7 @@ func (b *Bot) getOwner(ctx context.Context, evt *event.Event) { } if cfg.Owner == "" { - b.Error(span.Context(), evt.RoomID, "owner is not set yet") + b.Notice(span.Context(), evt.RoomID, "owner is not set yet") return } @@ -52,7 +52,7 @@ func (b *Bot) setOwner(ctx context.Context, evt *event.Event, owner string) { } if !cfg.Allowed(b.noowner, evt.Sender) { - b.Error(span.Context(), evt.RoomID, "you don't have permission to do that") + b.Notice(span.Context(), evt.RoomID, "you don't have permission to do that") return }