" + escapeTelegramWithinBudget(recipient, 320) + "",
"收件时间：" + html.EscapeString(timeText),
}
+ if payload.OTP != "" {
+ lines = append(lines, "", "🔐 验证码", ""+html.EscapeString(payload.OTP)+"")
+ }
if len(payload.AttachmentNames) > 0 {
names := make([]string, 0, len(payload.AttachmentNames))
for _, name := range payload.AttachmentNames {
- names = append(names, html.EscapeString(name))
+ names = append(names, escapeTelegramWithinBudget(name, 180))
}
- lines = append(lines, "附件："+strings.Join(names, "、"))
+ attachmentText := strings.Join(names, "、")
+ if payload.AttachmentCount > len(payload.AttachmentNames) {
+ attachmentText += fmt.Sprintf("，其余 %d 个未显示", payload.AttachmentCount-len(payload.AttachmentNames))
+ }
+ lines = append(lines, "", fmt.Sprintf("📎 附件：%d 个", max(payload.AttachmentCount, len(payload.AttachmentNames))), attachmentText)
}
body := strings.TrimSpace(payload.Body)
if body != "" {
@@ -295,18 +721,129 @@ func formatTelegramMailMessage(payload telegramMailPayload) string {
if normalizeTelegramBodyMode(payload.BodyMode) == "full" {
label = "邮件正文"
}
- lines = append(lines, "", ""+label+"：", ""+html.EscapeString(body)+"") + prefix := strings.Join(lines, "\n") + "\n\n" + label + "\n
" + suffix := "" + body = escapeTelegramWithinBudget(body, telegramMessageBudget-utf8.RuneCountInString(prefix)-utf8.RuneCountInString(suffix)) + lines = []string{prefix + body + suffix} } - return strings.Join(lines, "\n") + htmlText := strings.Join(lines, "\n") + plain := formatTelegramMailPlainText(payload) + return telegramFormattedMessage{HTML: htmlText, PlainText: plain, OTP: payload.OTP} } func (a *App) sendTelegramMessage(ctx context.Context, token, chatID, text string) error { - return a.callTelegram(ctx, token, "sendMessage", map[string]any{ + _, err := a.sendTelegramPayload(ctx, token, map[string]any{ "chat_id": chatID, "text": text, "parse_mode": "HTML", "disable_web_page_preview": true, - }, nil) + }) + return err +} + +func (a *App) deliverTelegramMailMessage(ctx context.Context, token, chatID string, message telegramFormattedMessage) (int64, error) { + payload := map[string]any{ + "chat_id": chatID, + "text": message.HTML, + "parse_mode": "HTML", + "disable_web_page_preview": true, + } + if markup := telegramCopyMarkup(message.OTP); markup != nil { + payload["reply_markup"] = markup + } + result, err := a.sendTelegramPayload(ctx, token, payload) + if err == nil { + return result.MessageID, nil + } + var apiErr *telegramAPIError + if !errors.As(err, &apiErr) || apiErr.ErrorCode != http.StatusBadRequest { + return 0, err + } + fallback := map[string]any{ + "chat_id": chatID, + "text": message.PlainText, + "disable_web_page_preview": true, + } + if markup := telegramCopyMarkup(message.OTP); markup != nil { + fallback["reply_markup"] = markup + } + result, err = a.sendTelegramPayload(ctx, token, fallback) + if err != nil { + return 0, err + } + return result.MessageID, nil +} + +func (a *App) sendTelegramPayload(ctx context.Context, token string, payload map[string]any) (telegramSentMessage, error) { + var result telegramSentMessage + err := a.callTelegram(ctx, token, "sendMessage", payload, &result) + return result, err +} + +func telegramCopyMarkup(otp string) map[string]any { + otp = strings.TrimSpace(otp) + if otp == "" || utf8.RuneCountInString(otp) > 256 { + return nil + } + return map[string]any{"inline_keyboard": [][]map[string]any{{{ + "text": "复制验证码", + "copy_text": map[string]string{"text": otp}, + }}}} +} + +func escapeTelegramWithinBudget(value string, budget int) string { + if budget <= 3 { + return "" + } + var out strings.Builder + used := 0 + truncated := false + for _, r := range value { + escaped := html.EscapeString(string(r)) + length := utf8.RuneCountInString(escaped) + if used+length > budget-3 { + truncated = true + break + } + out.WriteString(escaped) + used += length + } + if truncated { + out.WriteString("...") + } + return out.String() +} + +func formatTelegramMailPlainText(payload telegramMailPayload) string { + subject := strings.TrimSpace(payload.Subject) + if subject == "" || subject == "(no subject)" { + subject = "（无主题）" + } + from := strings.TrimSpace(payload.From) + if name := strings.TrimSpace(payload.FromName); name != "" { + from = name + " <" + from + ">" + } + receivedAt := parseTime(payload.ReceivedAt) + timeText := strings.TrimSpace(payload.ReceivedAt) + if !receivedAt.IsZero() { + timeText = receivedAt.Local().Format("2006-01-02 15:04:05 MST") + } + parts := []string{"新邮件通知", "", "主题：" + subject, "发件人：" + from, "收件邮箱：" + payload.Recipient, "收件时间：" + timeText} + if payload.OTP != "" { + parts = append(parts, "", "验证码", payload.OTP) + } + if payload.AttachmentCount > 0 { + parts = append(parts, "", fmt.Sprintf("附件：%d 个", payload.AttachmentCount)) + } + if body := strings.TrimSpace(payload.Body); body != "" { + parts = append(parts, "", "正文摘要", body) + } + text := normalizeTelegramText(strings.Join(parts, "\n")) + text, truncated := truncateRunes(text, telegramMessageBudget-3) + if truncated { + text += "..." + } + return text } func (a *App) callTelegram(ctx context.Context, token, method string, payload any, result any) error { @@ -345,7 +882,7 @@ func (a *App) callTelegram(ctx context.Context, token, method string, payload an if description == "" { description = fmt.Sprintf("HTTP %d", resp.StatusCode) } - return fmt.Errorf("Telegram 发送失败: %s", description) + return &telegramAPIError{HTTPStatus: resp.StatusCode, ErrorCode: apiResponse.ErrorCode, Description: description, RetryAfter: time.Duration(apiResponse.Parameters.RetryAfter) * time.Second} } if result != nil && len(apiResponse.Result) > 0 { if err := json.Unmarshal(apiResponse.Result, result); err != nil { diff --git a/apps/api/internal/app/telegram_test.go b/apps/api/internal/app/telegram_test.go index 1a03b39..d98dc25 100644 --- a/apps/api/internal/app/telegram_test.go +++ b/apps/api/internal/app/telegram_test.go @@ -3,24 +3,36 @@ package app import ( "context" "encoding/json" + "errors" + "fmt" "net/http" "net/http/httptest" "strings" + "sync/atomic" "testing" "time" + "unicode/utf8" + + "golang.org/x/text/encoding/simplifiedchinese" ) func TestTelegramSettingsDiscoveryTestAndMailQueue(t *testing.T) { type sentMessage struct { - ChatID string `json:"chat_id"` - Text string `json:"text"` + ChatID string `json:"chat_id"` + Text string `json:"text"` + ReplyMarkup map[string]any `json:"reply_markup"` } var sent []sentMessage + var pairingCode atomic.Value + pairingCode.Store("") telegramServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "application/json") switch r.URL.Path { + case "/bottest-token/getMe": + _, _ = w.Write([]byte(`{"ok":true,"result":{"id":1,"is_bot":true,"username":"newszxcn_test_bot"}}`)) case "/bottest-token/getUpdates": - _, _ = w.Write([]byte(`{"ok":true,"result":[{"update_id":7,"message":{"chat":{"id":123456789,"type":"private","first_name":"Zhenxi","last_name":"Shen"}}}]}`)) + code, _ := pairingCode.Load().(string) + _, _ = fmt.Fprintf(w, `{"ok":true,"result":[{"update_id":6,"message":{"text":"/start wrong-code","chat":{"id":987654321,"type":"private","first_name":"Other"}}},{"update_id":7,"message":{"text":"/start %s","chat":{"id":123456789,"type":"private","first_name":"Zhenxi","last_name":"Shen"}}}]}`, code) case "/bottest-token/sendMessage": var message sentMessage if err := json.NewDecoder(r.Body).Decode(&message); err != nil { @@ -54,6 +66,11 @@ func TestTelegramSettingsDiscoveryTestAndMailQueue(t *testing.T) { payload["telegramBotToken"] = "test-token" payload["telegramPrivateChatId"] = "123456789" payload["telegramBodyMode"] = "full" + var adminMailboxID string + if err := a.db.QueryRow(`SELECT id FROM mailboxes WHERE address='admin@lanqin.local'`).Scan(&adminMailboxID); err != nil { + t.Fatal(err) + } + payload["telegramMailboxIds"] = []string{adminMailboxID} if code := admin.do("POST", "/api/admin/settings", payload, &settings); code != http.StatusOK { t.Fatalf("save Telegram settings code=%d settings=%+v", code, settings) } @@ -64,8 +81,16 @@ func TestTelegramSettingsDiscoveryTestAndMailQueue(t *testing.T) { t.Fatal("Telegram token was not persisted in runtime config") } + var pairing struct { + Code string `json:"code"` + DeepLink string `json:"deepLink"` + } + if code := admin.do("POST", "/api/admin/settings/telegram/pair", map[string]string{"botToken": ""}, &pairing); code != http.StatusOK || pairing.Code == "" || !strings.Contains(pairing.DeepLink, pairing.Code) { + t.Fatalf("create pairing code=%d response=%+v", code, pairing) + } + pairingCode.Store(pairing.Code) var discovered map[string]string - if code := admin.do("POST", "/api/admin/settings/telegram/discover", map[string]string{"botToken": ""}, &discovered); code != http.StatusOK { + if code := admin.do("POST", "/api/admin/settings/telegram/discover", map[string]string{"botToken": "", "pairingCode": pairing.Code}, &discovered); code != http.StatusOK { t.Fatalf("discover chat code=%d response=%v", code, discovered) } if discovered["chatId"] != "123456789" || discovered["displayName"] != "Zhenxi Shen" { @@ -82,12 +107,13 @@ func TestTelegramSettingsDiscoveryTestAndMailQueue(t *testing.T) { sent = nil receivedAt := time.Date(2026, 8, 6, 9, 30, 0, 0, time.UTC) a.enqueueTelegramMailNotification(context.Background(), "mail_test_telegram", storedMessage{ + MailboxID: adminMailboxID, RecipientAddr: "admin@example.com", Subject: "账单 <已生成>", From: "billing@example.net", FromName: "Billing & Support", ReceivedAt: receivedAt, - BodyText: "这是邮件正文，包含
846981") {
+ t.Fatalf("message escaping or OTP formatting missing: %s", message.HTML)
+ }
+ if markup := telegramCopyMarkup(message.OTP); markup == nil {
+ t.Fatal("copy_text markup missing")
+ }
+}
+
+func TestTelegramPseudoHTMLAndBodyCharset(t *testing.T) {
+ pseudo := `验证码：778899
") || !strings.Contains(text, "778899") {
+ t.Fatalf("pseudo HTML was not cleaned: %q", text)
+ }
+
+ encoded, err := simplifiedchinese.GBK.NewEncoder().Bytes([]byte("您的验证码是 445566"))
+ if err != nil {
+ t.Fatal(err)
+ }
+ raw := append([]byte("From: sender@example.com\r\nTo: admin@example.com\r\nSubject: GBK\r\nContent-Type: text/plain; charset=gbk\r\n\r\n"), encoded...)
+ a := newTestApp(t)
+ stopTestWorkers(a)
+ msg, _, err := a.parseMaildirMessage(raw, "admin@example.com")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !strings.Contains(msg.BodyText, "445566") || !strings.Contains(msg.BodyText, "验证码") {
+ t.Fatalf("GBK body was not decoded: %q", msg.BodyText)
+ }
+}
+
+func TestTelegramRetryAfterAndPermanentErrors(t *testing.T) {
+ tests := []struct {
+ name string
+ status int
+ response string
+ retryAfter time.Duration
+ }{
+ {name: "rate limit", status: http.StatusTooManyRequests, response: `{"ok":false,"error_code":429,"description":"Too Many Requests","parameters":{"retry_after":17}}`, retryAfter: 17 * time.Second},
+ {name: "unauthorized", status: http.StatusUnauthorized, response: `{"ok":false,"error_code":401,"description":"Unauthorized"}`},
+ }
+ for _, tc := range tests {
+ t.Run(tc.name, func(t *testing.T) {
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+ w.WriteHeader(tc.status)
+ _, _ = w.Write([]byte(tc.response))
+ }))
+ defer server.Close()
+ a := newTestApp(t)
+ stopTestWorkers(a)
+ a.telegramURL = server.URL
+ err := a.sendTelegramMessage(context.Background(), "test-token", "123456", "test")
+ var apiErr *telegramAPIError
+ if !errors.As(err, &apiErr) || apiErr.ErrorCode != tc.status || apiErr.RetryAfter != tc.retryAfter {
+ t.Fatalf("unexpected Telegram error: %#v", err)
+ }
+ })
+ }
+}
+
+func TestTelegramMailboxScopeAndOriginalRecipient(t *testing.T) {
+ a := newTestApp(t)
+ stopTestWorkers(a)
+ var mailboxID string
+ if err := a.db.QueryRow(`SELECT id FROM mailboxes WHERE address='admin@lanqin.local'`).Scan(&mailboxID); err != nil {
+ t.Fatal(err)
+ }
+ a.updateConfig(func(cfg *Config) {
+ cfg.TelegramMailEnabled = true
+ cfg.TelegramBotToken = "test-token"
+ cfg.TelegramPrivateChatID = "123456"
+ cfg.TelegramMailboxIDs = mailboxID
+ })
+ a.enqueueTelegramMailNotification(context.Background(), "scope-denied", storedMessage{MailboxID: "another-mailbox", RecipientAddr: "other@example.com", Subject: "denied"}, nil)
+ a.enqueueTelegramMailNotification(context.Background(), "scope-allowed", storedMessage{MailboxID: mailboxID, RecipientAddr: "admin@lanqin.local", Subject: "allowed"}, nil)
+ var count int
+ if err := a.db.QueryRow(`SELECT COUNT(1) FROM telegram_mail_outbox`).Scan(&count); err != nil || count != 1 {
+ t.Fatalf("unexpected scoped queue count=%d err=%v", count, err)
+ }
+
+ raw := []byte("From: sender@example.com\r\nTo: hidden-list@example.net\r\nDelivered-To: admin@lanqin.local\r\nSubject: recipient\r\n\r\nbody")
+ msg, _, err := a.parseMaildirMessage(raw, "admin@lanqin.local")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if msg.RecipientAddr != "admin@lanqin.local" {
+ t.Fatalf("wrong original recipient: %q", msg.RecipientAddr)
+ }
+}
+
+func TestTelegramBadRequestFallsBackToPlainText(t *testing.T) {
+ var calls atomic.Int32
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Set("Content-Type", "application/json")
+ var payload map[string]any
+ if err := json.NewDecoder(r.Body).Decode(&payload); err != nil {
+ t.Fatal(err)
+ }
+ if calls.Add(1) == 1 {
+ w.WriteHeader(http.StatusBadRequest)
+ _, _ = w.Write([]byte(`{"ok":false,"error_code":400,"description":"Bad Request: can't parse entities"}`))
+ return
+ }
+ if _, exists := payload["parse_mode"]; exists {
+ t.Fatal("plain-text fallback still included parse_mode")
+ }
+ _, _ = w.Write([]byte(`{"ok":true,"result":{"message_id":99}}`))
+ }))
+ defer server.Close()
+ a := newTestApp(t)
+ stopTestWorkers(a)
+ a.telegramURL = server.URL
+ messageID, err := a.deliverTelegramMailMessage(context.Background(), "test-token", "123456", telegramFormattedMessage{HTML: "broken", PlainText: "safe fallback", OTP: "123456"})
+ if err != nil || messageID != 99 || calls.Load() != 2 {
+ t.Fatalf("fallback failed: messageId=%d calls=%d err=%v", messageID, calls.Load(), err)
+ }
+}
+
+func TestTelegramMalformedQueueItemDoesNotBlockLaterMail(t *testing.T) {
+ var calls atomic.Int32
+ server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
+ calls.Add(1)
+ w.Header().Set("Content-Type", "application/json")
+ _, _ = w.Write([]byte(`{"ok":true,"result":{"message_id":7}}`))
+ }))
+ defer server.Close()
+ a := newTestApp(t)
+ stopTestWorkers(a)
+ a.telegramURL = server.URL
+ a.updateConfig(func(cfg *Config) {
+ cfg.TelegramMailEnabled = true
+ cfg.TelegramBotToken = "test-token"
+ cfg.TelegramPrivateChatID = "123456"
+ })
+ now := a.now().UTC().Format(time.RFC3339Nano)
+ if _, err := a.db.Exec(`INSERT INTO telegram_mail_outbox(id,message_id,payload_json,next_attempt_at,created_at,updated_at) VALUES('bad','bad','{',?,?,?),('good','good',?, ?, ?, ?)`, now, now, now, jsonEncode(telegramMailPayload{Subject: "good", From: "sender@example.com", Recipient: "admin@example.com", ReceivedAt: now, Body: "body"}), now, now, now); err != nil {
+ t.Fatal(err)
+ }
+ if err := a.processDueTelegramMailNotifications(context.Background()); err != nil {
+ t.Fatal(err)
+ }
+ var badAttempts int
+ var delivered string
+ if err := a.db.QueryRow(`SELECT attempt_count FROM telegram_mail_outbox WHERE id='bad'`).Scan(&badAttempts); err != nil {
+ t.Fatal(err)
+ }
+ if err := a.db.QueryRow(`SELECT COALESCE(delivered_at,'') FROM telegram_mail_outbox WHERE id='good'`).Scan(&delivered); err != nil {
+ t.Fatal(err)
+ }
+ if badAttempts != telegramMailMaxAttempts || delivered == "" || calls.Load() != 1 {
+ t.Fatalf("malformed queue handling failed: attempts=%d delivered=%q calls=%d", badAttempts, delivered, calls.Load())
+ }
+}
diff --git a/apps/web/src/lib/api-types.ts b/apps/web/src/lib/api-types.ts
index 4d1cc07..9f2a5aa 100644
--- a/apps/web/src/lib/api-types.ts
+++ b/apps/web/src/lib/api-types.ts
@@ -237,9 +237,12 @@ export type SystemSettings = {
telegramBotTokenSet: boolean
telegramPrivateChatId: string
telegramBodyMode: "summary" | "full"
+ telegramMailboxIds: string[]
+ telegramIncludeUnregistered: boolean
}
export type SystemSettingsPayload = Omit{telegramPairing.code}
+
+