fix(senders): fix error validation in telegram (#890)

moira-alert · Aug 3, 2023 · f29ce12 · f29ce12
1 parent 267f7f4
commit f29ce12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/senders/telegram/handle_message.go b/senders/telegram/handle_message.go
@@ -15,9 +15,11 @@ func (sender *Sender) handleMessage(message *telebot.Message) error {
 		return err
 	}
 	if responseMessage != "" {
-		_, err = sender.bot.Send(message.Chat, responseMessage)
+		if _, err = sender.bot.Send(message.Chat, responseMessage); err != nil {
+			return removeTokenFromError(err, sender.bot)
+		}
 	}
-	return removeTokenFromError(err, sender.bot)
+	return nil
 }
 
 func (sender *Sender) getResponseMessage(message *telebot.Message) (string, error) {

diff --git a/senders/telegram/init.go b/senders/telegram/init.go
@@ -52,7 +52,7 @@ func removeTokenFromError(err error, bot *telebot.Bot) error {
 	if bot != nil {
 		url = bot.URL
 	}
-	if strings.Contains(err.Error(), url) {
+	if err != nil && strings.Contains(err.Error(), url) {
 		return errors.New(moira.ReplaceSubstring(err.Error(), "/bot", "/", hidden))
 	}
 	return err