enable setting the chatid in the config. always log chatid if it's unset and we have a message from the target username.

aetaric · aetaric · commit 9f0ecef3218d · 2023-12-15T07:54:02.000-07:00
diff --git a/checkrr.yaml.example b/checkrr.yaml.example
@@ -82,6 +82,7 @@ notifications:
   telegram:
     apitoken: ""
     username: "@username" # This must start with an @ to send to a user, otherwise, list the channel name
+    chatid: 0 # Start checkrr, DM the bot, and then trigger a run. Checkrr will log the chatid to the console. Place the chatid value here.
     notificationtypes:
       - reacquire
       - unknowndetected
diff --git a/notifications/telegram.go b/notifications/telegram.go
@@ -13,6 +13,7 @@ type Telegram struct {
 	AllowedNotifs []string
 	apiToken      string
 	username      string
+	chatid        int64
 	bot           *tgbotapi.BotAPI
 	Log           log.Logger
 }
@@ -25,20 +26,7 @@ func (t Telegram) Notify(title string, description string, notifType string, pat
 		}
 	}
 	if allowed {
-		var chatid int64
-		updates, err := t.bot.GetUpdates(tgbotapi.UpdateConfig{})
-		if err != nil {
-			return false
-		}
-		for _, update := range updates {
-			t.Log.Debug(fmt.Sprintf("User: %s", update.SentFrom().UserName))
-			if fmt.Sprintf("@%s", update.SentFrom().UserName) == t.username {
-				chatid = update.FromChat().ID
-				t.Log.Debug(fmt.Sprintf("chatid: %v", chatid))
-				break
-			}
-		}
-		message := tgbotapi.NewMessage(chatid, description)
+		message := tgbotapi.NewMessage(t.chatid, description)
 		t.bot.Send(message)
 		return true
 	}
@@ -54,6 +42,20 @@ func (t *Telegram) Connect() bool {
 		t.Log.WithFields(log.Fields{"Error": err, "Username": t.username, "Token": t.apiToken}).Warn("Error connecting to Telegram")
 		return false
 	}
+	updates, err := t.bot.GetUpdates(tgbotapi.UpdateConfig{})
+	if err != nil {
+		return false
+	}
+	if t.chatid == 0 {
+		for _, update := range updates {
+			t.Log.Debug(fmt.Sprintf("User: %s", update.SentFrom().UserName))
+			if fmt.Sprintf("@%s", update.SentFrom().UserName) == t.username {
+				t.chatid = update.FromChat().ID
+				t.Log.Infof("Telegram chatid: %v", t.chatid)
+				break
+			}
+		}
+	}
 	t.Log.Info("Connected to Telegram")
 	return true
 }
@@ -62,5 +64,6 @@ func (t *Telegram) FromConfig(config viper.Viper) {
 	t.config = config
 	t.apiToken = config.GetString("apitoken")
 	t.username = config.GetString("username")
+	t.chatid = config.GetInt64("chatid")
 	t.AllowedNotifs = config.GetStringSlice("notificationtypes")
 }
