add support for telegram message_thread_id

Signed-off-by: Kasama <[email protected]>
(cherry picked from commit 2da2adf)

Author: Kasama

internal/notifier/telegram.go

@@ -25,9 +25,10 @@ type Telegram struct {
 // TelegramPayload represents the payload sent to Telegram Bot API
 // Reference: https://core.telegram.org/bots/api#sendmessage
 type TelegramPayload struct {
-	ChatID    string `json:"chat_id"`    // Unique identifier for the target chat
-	Text      string `json:"text"`       // Text of the message to be sent
-	ParseMode string `json:"parse_mode"` // Mode for parsing entities in the message text
+	ChatID          string `json:"chat_id"`                     // Unique identifier for the target chat
+	MessageThreadID string `json:"message_thread_id,omitempty"` // Unique identifier for the target message thread (topic) of the forum; for forum supergroups only
+	Text            string `json:"text"`                        // Text of the message to be sent
+	ParseMode       string `json:"parse_mode"`                  // Mode for parsing entities in the message text
 }
 
 func NewTelegram(proxyURL, channel, token string) (*Telegram, error) {
@@ -66,12 +67,18 @@ func (t *Telegram) Post(ctx context.Context, event eventv1.Event) error {
 	}
 	message := fmt.Sprintf("*%s*\n%s\n%s", escapeString(heading), escapeString(event.Message), metadata)
 
+	chatID, thread, channelHasThreadID := strings.Cut(t.Channel, ":")
+
 	payload := TelegramPayload{
-		ChatID:    t.Channel,
+		ChatID:    chatID,
 		Text:      message,
 		ParseMode: "MarkdownV2", // https://core.telegram.org/bots/api#markdownv2-style
 	}
 
+	if channelHasThreadID {
+		payload.MessageThreadID = thread
+	}
+
 	apiURL, err := url.JoinPath(t.url, sendMessageMethodName)
 	if err != nil {
 		return fmt.Errorf("failed to construct API URL: %w", err)

internal/notifier/telegram_test.go

@@ -29,9 +29,8 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func TestTelegram_Post(t *testing.T) {
-	g := NewWithT(t)
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+func telegramMockServer(g *WithT, expected *TelegramPayload) *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		g.Expect(r.Method).To(Equal(http.MethodPost))
 		g.Expect(r.URL.Path).To(Equal("/sendMessage"))
 		g.Expect(r.Header.Get("Content-Type")).To(Equal("application/json"))
@@ -43,8 +42,9 @@ func TestTelegram_Post(t *testing.T) {
 		err = json.Unmarshal(b, &payload)
 		g.Expect(err).ToNot(HaveOccurred())
 
-		g.Expect(payload.ChatID).To(Equal("channel"))
-		g.Expect(payload.ParseMode).To(Equal("MarkdownV2"))
+		g.Expect(payload.ChatID).To(Equal(expected.ChatID))
+		g.Expect(payload.MessageThreadID).To(Equal(expected.MessageThreadID))
+		g.Expect(payload.ParseMode).To(Equal(expected.ParseMode))
 
 		lines := strings.Split(payload.Text, "\n")
 		g.Expect(lines).To(HaveLen(5))
@@ -59,6 +59,15 @@ func TestTelegram_Post(t *testing.T) {
 
 		w.WriteHeader(http.StatusOK)
 	}))
+}
+
+func TestTelegram_Post(t *testing.T) {
+	g := NewWithT(t)
+	ts := telegramMockServer(g, &TelegramPayload{
+		ChatID:          "channel",
+		MessageThreadID: "",
+		ParseMode:       "MarkdownV2",
+	})
 	defer ts.Close()
 
 	telegram, err := NewTelegram("", "channel", "token")
@@ -71,3 +80,23 @@ func TestTelegram_Post(t *testing.T) {
 	err = telegram.Post(context.TODO(), ev)
 	g.Expect(err).ToNot(HaveOccurred())
 }
+
+func TestTelegram_PostWithMessageThreadID(t *testing.T) {
+	g := NewWithT(t)
+	ts := telegramMockServer(g, &TelegramPayload{
+		ChatID:          "channel",
+		MessageThreadID: "thread",
+		ParseMode:       "MarkdownV2",
+	})
+	defer ts.Close()
+
+	telegram, err := NewTelegram("", "channel:thread", "token")
+	g.Expect(err).ToNot(HaveOccurred())
+
+	telegram.url = ts.URL
+
+	ev := testEvent()
+	ev.Metadata["kubernetes.io/somekey"] = "some.value"
+	err = telegram.Post(context.TODO(), ev)
+	g.Expect(err).ToNot(HaveOccurred())
+}