修复多规则目标渠道转发

Author: trah01

main_test.go

@@ -223,6 +223,70 @@ func TestNormalizeForwardRule_MigratesSingleTargetAndDeduplicates(t *testing.T)
 	}
 }
 
+func TestPlanForwardTargets_CollectsAllMatchingRulesAndDeduplicates(t *testing.T) {
+	msg := &Message{AccountID: "acc_1", Subject: "测试通知", Body: "正文"}
+	rules := []ForwardRule{
+		{
+			SourceAccount: "acc_1",
+			TargetWebhook: "wh_feishu",
+		},
+		{
+			SourceAccounts: []string{"acc_1"},
+			TargetWebhooks: []string{"wh_dingtalk", "wh_feishu"},
+			IncludeLinks:   true,
+		},
+		{
+			SourceAccount: "acc_other",
+			TargetWebhook: "wh_other",
+		},
+	}
+
+	targets, sourceMatched, blockedReasons := planForwardTargets(rules, nil, msg, filterContext{})
+
+	if !sourceMatched {
+		t.Fatal("expected source to match forwarding rules")
+	}
+	if len(blockedReasons) != 0 {
+		t.Fatalf("expected no blocked rules, got %#v", blockedReasons)
+	}
+	if len(targets) != 2 {
+		t.Fatalf("expected two unique targets, got %#v", targets)
+	}
+	if targets[0].ID != "wh_feishu" || targets[1].ID != "wh_dingtalk" {
+		t.Fatalf("expected targets from every matching rule in order, got %#v", targets)
+	}
+	if !targets[0].IncludeLinks || !targets[1].IncludeLinks {
+		t.Fatalf("expected include-links option to be merged per target, got %#v", targets)
+	}
+}
+
+func TestPlanForwardTargets_FilteredRuleDoesNotBlockAnotherMatchingRule(t *testing.T) {
+	msg := &Message{AccountID: "acc_1", From: "notice@example.com", Subject: "普通通知", Body: "正文"}
+	filterRules := map[string]FilterRule{
+		"only_bill": {
+			ID:       "only_bill",
+			Name:     "只允许账单",
+			Type:     "content",
+			Mode:     "whitelist",
+			Patterns: []string{"账单"},
+			Enabled:  true,
+		},
+	}
+	rules := []ForwardRule{
+		{SourceAccount: "acc_1", TargetWebhook: "wh_feishu", FilterRuleIDs: []string{"only_bill"}},
+		{SourceAccount: "acc_1", TargetWebhook: "wh_dingtalk"},
+	}
+
+	targets, sourceMatched, blockedReasons := planForwardTargets(rules, filterRules, msg, filterContext{DisplaySender: msg.From})
+
+	if !sourceMatched || len(blockedReasons) != 1 {
+		t.Fatalf("expected one filtered matching rule, matched=%v reasons=%#v", sourceMatched, blockedReasons)
+	}
+	if len(targets) != 1 || targets[0].ID != "wh_dingtalk" {
+		t.Fatalf("expected allowed matching rule to remain active, got %#v", targets)
+	}
+}
+
 func TestParseInboundPayload_GitHubPush(t *testing.T) {
 	req, err := http.NewRequest("POST", "/hook/test", strings.NewReader(""))
 	if err != nil {

processor.go

@@ -6,6 +6,11 @@ import (
 	"time"
 )
 
+type plannedForwardTarget struct {
+	ID           string
+	IncludeLinks bool
+}
+
 func processPendingMessages() {
 	// 防止消息发送队列重叠并发引发重复发送通知
 	if !processingMutex.TryLock() {
@@ -52,93 +57,73 @@ func processPendingMessages() {
 			continue
 		}
 
-		// 匹配规则，找到第一条匹配的规则进行发送
-		ruleMatched := false
-		filterBlocked := false
-		for _, rule := range rules {
-			rule = normalizeForwardRule(rule)
-			// 检查源账号匹配
-			if !ruleMatchesSource(rule, msg.AccountID) {
-				continue
-			}
-
-			filterCtx := buildFilterContext(&msg, accounts)
-			filterResult := applyFilterRules(rule.FilterRuleIDs, filterRules, &msg, filterCtx)
-			if !filterResult.Allowed {
-				filterBlocked = true
-				addLog(fmt.Sprintf("消息被过滤规则拦截 [%s]: %s", displaySubject(msg.Subject), filterResult.Reason), "info")
-				continue
-			}
-
-			targetIDs := rule.TargetWebhooks
-			if len(targetIDs) == 0 {
-				continue
-			}
-
-			ruleMatched = true
+		// 汇总所有匹配规则的目标。同一目标被多条规则命中时只发送一次。
+		filterCtx := buildFilterContext(&msg, accounts)
+		targets, sourceMatched, filterBlocked := planForwardTargets(rules, filterRules, &msg, filterCtx)
+		ruleMatched := len(targets) > 0
+		for _, reason := range filterBlocked {
+			addLog(fmt.Sprintf("消息被过滤规则拦截 [%s]: %s", displaySubject(msg.Subject), reason), "info")
+		}
 
-			// 发送
-			var sendErr error
+		if ruleMatched {
 			dateStr := displayMessageDate(msg.Date)
 			subjectForSend := displaySubject(msg.Subject)
 			senderForSend := filterCtx.DisplaySender
-
-			// 智能提取验证码并高亮前置
-			displayBody := formatForwardBody(msg.Body, rule.IncludeLinks)
-			var verificationCode string
-			if matches := codeRegex.FindStringSubmatch(msg.Subject); len(matches) > 1 {
-				verificationCode = matches[1]
-			} else if matches := codeRegex.FindStringSubmatch(msg.Body); len(matches) > 1 {
-				verificationCode = matches[1]
-			}
-
-			if verificationCode != "" {
-				displayBody = fmt.Sprintf("**[智能提取验证码] %s**\n\n%s", verificationCode, displayBody)
-			}
-
-			sentTargets := make([]string, 0, len(targetIDs))
+			verificationCode := extractVerificationCode(&msg)
+			sentTargets := make([]string, 0, len(targets))
 			failedTargets := make([]string, 0)
-			for _, targetID := range targetIDs {
-				webhook, ok := webhooks[targetID]
-				if !ok || !webhook.Enabled {
+			historyTargets := make([]string, 0, len(targets))
+
+			for _, planned := range targets {
+				webhook, ok := webhooks[planned.ID]
+				if !ok {
+					failedTargets = append(failedTargets, fmt.Sprintf("%s: 目标渠道不存在", planned.ID))
+					historyTargets = append(historyTargets, planned.ID+"（失败）")
+					continue
+				}
+				if !webhook.Enabled {
+					failedTargets = append(failedTargets, fmt.Sprintf("%s: 目标渠道已禁用", webhook.Name))
+					historyTargets = append(historyTargets, webhook.Name+"（失败）")
 					continue
 				}
 
-				sendErr = sendToWebhookTarget(webhook, accounts, subjectForSend, senderForSend, dateStr, displayBody)
+				displayBody := formatForwardBody(msg.Body, planned.IncludeLinks)
+				if verificationCode != "" {
+					displayBody = fmt.Sprintf("**[智能提取验证码] %s**\n\n%s", verificationCode, displayBody)
+				}
 
-				if sendErr != nil {
-					failedTargets = append(failedTargets, fmt.Sprintf("%s: %v", webhook.Name, sendErr))
-					addLog(fmt.Sprintf("发送失败 [%s -> %s]: %v", subjectForSend, webhook.Name, sendErr), "error")
+				if err := sendToWebhookTarget(webhook, accounts, subjectForSend, senderForSend, dateStr, displayBody); err != nil {
+					failedTargets = append(failedTargets, fmt.Sprintf("%s: %v", webhook.Name, err))
+					historyTargets = append(historyTargets, webhook.Name+"（失败）")
+					addLog(fmt.Sprintf("发送失败 [%s -> %s]: %v", subjectForSend, webhook.Name, err), "error")
 					continue
 				}
 				sentTargets = append(sentTargets, webhook.Name)
+				historyTargets = append(historyTargets, webhook.Name)
 				addLog(fmt.Sprintf("转发成功 [%s -> %s]", subjectForSend, webhook.Name), "success")
 			}
 
+			msg.TargetType = "multi"
+			msg.TargetName = strings.Join(historyTargets, ", ")
 			if len(sentTargets) == 0 {
 				msg.RetryCount++
 				msg.ErrorMessage = strings.Join(failedTargets, "; ")
-				if msg.ErrorMessage == "" {
-					msg.ErrorMessage = "没有可用的目标 Webhook"
-				}
 				saveMessage(&msg)
 			} else {
 				msg.Status = "sent"
-				msg.TargetType = "multi"
-				msg.TargetName = strings.Join(sentTargets, ", ")
+				msg.ErrorMessage = ""
 				if len(failedTargets) > 0 {
 					msg.ErrorMessage = "部分目标失败: " + strings.Join(failedTargets, "; ")
 				}
 				now := time.Now()
 				msg.SentAt = &now
 				saveMessage(&msg)
 			}
-			break // 匹配到第一条规则并尝试发送后，不再继续匹配后续规则
 		}
 
-		// 没有匹配到任何转发规则的消息，标记为 no_rule 防止永远卡在 pending 堵塞队列
+		// 没有匹配到任何转发规则的消息，标记状态防止永远卡在 pending 堵塞队列。
 		if !ruleMatched {
-			if filterBlocked {
+			if sourceMatched && len(filterBlocked) > 0 {
 				msg.Status = "filtered"
 				msg.ErrorMessage = "已被过滤规则拦截"
 				saveMessage(&msg)
@@ -153,6 +138,49 @@ func processPendingMessages() {
 	}
 }
 
+func planForwardTargets(rules []ForwardRule, filterRules map[string]FilterRule, msg *Message, filterCtx filterContext) ([]plannedForwardTarget, bool, []string) {
+	targets := make([]plannedForwardTarget, 0)
+	targetIndexes := make(map[string]int)
+	sourceMatched := false
+	blockedReasons := make([]string, 0)
+
+	for _, rule := range rules {
+		rule = normalizeForwardRule(rule)
+		if !ruleMatchesSource(rule, msg.AccountID) {
+			continue
+		}
+		sourceMatched = true
+
+		filterResult := applyFilterRules(rule.FilterRuleIDs, filterRules, msg, filterCtx)
+		if !filterResult.Allowed {
+			blockedReasons = append(blockedReasons, filterResult.Reason)
+			continue
+		}
+
+		for _, targetID := range rule.TargetWebhooks {
+			if index, exists := targetIndexes[targetID]; exists {
+				// 任一匹配规则要求保留链接时，为该目标保留链接。
+				targets[index].IncludeLinks = targets[index].IncludeLinks || rule.IncludeLinks
+				continue
+			}
+			targetIndexes[targetID] = len(targets)
+			targets = append(targets, plannedForwardTarget{ID: targetID, IncludeLinks: rule.IncludeLinks})
+		}
+	}
+
+	return targets, sourceMatched, blockedReasons
+}
+
+func extractVerificationCode(msg *Message) string {
+	if matches := codeRegex.FindStringSubmatch(msg.Subject); len(matches) > 1 {
+		return matches[1]
+	}
+	if matches := codeRegex.FindStringSubmatch(msg.Body); len(matches) > 1 {
+		return matches[1]
+	}
+	return ""
+}
+
 func ruleMatchesSource(rule ForwardRule, accountID string) bool {
 	for _, sourceID := range rule.SourceAccounts {
 		if sourceID == "all" || sourceID == accountID {

static/app.js

@@ -666,13 +666,14 @@ function renderHistory(messages) {
                 </span>
                 <span>
                     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="22" y1="2" x2="11" y2="13"/><polygon points="22 2 15 22 11 13 2 9 22 2"/></svg>
-                    ${msg.target_name || '-'}
+                    ${escapeHtml(msg.target_name || '-')}
                 </span>
                 <span>
                     <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg>
                     ${formatDate(msg.created_at)}
                 </span>
             </div>
+            ${msg.error_message ? `<div class="history-error">${escapeHtml(msg.error_message)}</div>` : ''}
         </div>
     `).join('');
 }

static/style.css

@@ -1346,6 +1346,14 @@ textarea.form-input {
     color: var(--text-tertiary);
 }
 
+.history-error {
+    margin-top: 8px;
+    color: var(--error);
+    font-size: 0.825rem;
+    line-height: 1.5;
+    overflow-wrap: anywhere;
+}
+
 /* ===================== Scrollbar ===================== */
 ::-webkit-scrollbar {
     width: 8px;