完善过滤规则历史操作和站内弹窗

Author: trah01

api.go

@@ -295,6 +295,10 @@ func setupAPI(r *gin.Engine) {
 
 	r.DELETE("/api/filters/:id", func(c *gin.Context) {
 		id := c.Param("id")
+		if id == DefaultSenderBlacklistID || id == DefaultSenderWhitelistID {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "默认发件人过滤规则不能删除"})
+			return
+		}
 		configLock.Lock()
 		newFilters := make([]FilterRule, 0, len(config.FilterRules))
 		for _, f := range config.FilterRules {
@@ -311,6 +315,26 @@ func setupAPI(r *gin.Engine) {
 		c.JSON(http.StatusOK, gin.H{"success": true})
 	})
 
+	r.POST("/api/filters/default-senders", func(c *gin.Context) {
+		var req struct {
+			Mode   string `json:"mode"`
+			Sender string `json:"sender"`
+		}
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+		if req.Mode != "blacklist" && req.Mode != "whitelist" {
+			c.JSON(http.StatusBadRequest, gin.H{"error": "mode must be blacklist or whitelist"})
+			return
+		}
+		configLock.Lock()
+		rule, added := addSenderToDefaultFilterRuleNoLock(req.Mode, req.Sender)
+		saveConfigNoLock()
+		configLock.Unlock()
+		c.JSON(http.StatusOK, gin.H{"success": true, "added": added, "rule": rule})
+	})
+
 	// ===== 规则管理 =====
 	r.GET("/api/rules", func(c *gin.Context) {
 		configLock.RLock()

config.example.json

@@ -28,21 +28,25 @@
       "name": "转发全部",
       "source_account": "all",
       "target_webhook": "wh_17700000000",
-      "filters": [],
       "filter_rule_ids": [],
       "enabled": true
     }
   ],
   "filter_rules": [
     {
-      "id": "filter_17700000000",
-      "name": "屏蔽营销邮件",
-      "type": "content",
+      "id": "default_sender_blacklist",
+      "name": "默认发件人黑名单",
+      "type": "sender",
       "mode": "blacklist",
-      "patterns": [
-        "unsubscribe",
-        "退订"
-      ],
+      "patterns": [],
+      "enabled": true
+    },
+    {
+      "id": "default_sender_whitelist",
+      "name": "默认发件人白名单",
+      "type": "sender",
+      "mode": "whitelist",
+      "patterns": [],
       "enabled": true
     }
   ],

config.go

@@ -21,8 +21,12 @@ func loadConfig() {
 	if err == nil {
 		json.Unmarshal(data, &config)
 	} else {
+		ensureDefaultSenderFilterRulesNoLock()
 		saveConfigNoLock()
+		return
 	}
+	ensureDefaultSenderFilterRulesNoLock()
+	saveConfigNoLock()
 }
 
 func saveConfigNoLock() {

filter.go

@@ -5,6 +5,11 @@ import (
 	"strings"
 )
 
+const (
+	DefaultSenderBlacklistID = "default_sender_blacklist"
+	DefaultSenderWhitelistID = "default_sender_whitelist"
+)
+
 // FilterRule 是独立的邮件过滤规则，可被多个转发规则复用。
 type FilterRule struct {
 	ID       string   `json:"id"`
@@ -48,6 +53,69 @@ func normalizeFilterRule(rule FilterRule) FilterRule {
 	return rule
 }
 
+func ensureDefaultSenderFilterRulesNoLock() {
+	ensureDefaultFilterRuleNoLock(FilterRule{
+		ID:       DefaultSenderBlacklistID,
+		Name:     "默认发件人黑名单",
+		Type:     "sender",
+		Mode:     "blacklist",
+		Patterns: []string{},
+		Enabled:  true,
+	})
+	ensureDefaultFilterRuleNoLock(FilterRule{
+		ID:       DefaultSenderWhitelistID,
+		Name:     "默认发件人白名单",
+		Type:     "sender",
+		Mode:     "whitelist",
+		Patterns: []string{},
+		Enabled:  true,
+	})
+}
+
+func ensureDefaultFilterRuleNoLock(rule FilterRule) {
+	rule = normalizeFilterRule(rule)
+	for i, existing := range config.FilterRules {
+		if existing.ID == rule.ID {
+			existing.Name = rule.Name
+			existing.Type = rule.Type
+			existing.Mode = rule.Mode
+			config.FilterRules[i] = normalizeFilterRule(existing)
+			return
+		}
+	}
+	config.FilterRules = append(config.FilterRules, rule)
+}
+
+func addSenderToDefaultFilterRuleNoLock(mode string, sender string) (FilterRule, bool) {
+	sender = strings.TrimSpace(sender)
+	if sender == "" {
+		return FilterRule{}, false
+	}
+
+	ruleID := DefaultSenderBlacklistID
+	if mode == "whitelist" {
+		ruleID = DefaultSenderWhitelistID
+	}
+	ensureDefaultSenderFilterRulesNoLock()
+
+	for i, rule := range config.FilterRules {
+		if rule.ID != ruleID {
+			continue
+		}
+		rule = normalizeFilterRule(rule)
+		for _, pattern := range rule.Patterns {
+			if strings.EqualFold(pattern, sender) {
+				config.FilterRules[i] = rule
+				return rule, false
+			}
+		}
+		rule.Patterns = append(rule.Patterns, sender)
+		config.FilterRules[i] = normalizeFilterRule(rule)
+		return config.FilterRules[i], true
+	}
+	return FilterRule{}, false
+}
+
 func applyFilterRules(ids []string, rules map[string]FilterRule, msg *Message) filterResult {
 	for _, id := range ids {
 		rule, ok := rules[id]

main_test.go

@@ -118,3 +118,34 @@ func TestApplyFilterRules_WhitelistRequiresContentMatch(t *testing.T) {
 		t.Fatalf("expected whitelist content rule to allow matched message: %s", got.Reason)
 	}
 }
+
+func TestAddSenderToDefaultFilterRuleNoLock_CreatesDefaultsAndDeduplicates(t *testing.T) {
+	oldConfig := config
+	t.Cleanup(func() {
+		config = oldConfig
+	})
+	config = Config{}
+
+	rule, added := addSenderToDefaultFilterRuleNoLock("blacklist", "spam@example.com")
+	if !added {
+		t.Fatalf("expected sender to be added")
+	}
+	if rule.ID != DefaultSenderBlacklistID {
+		t.Fatalf("expected blacklist rule, got %q", rule.ID)
+	}
+	if len(rule.Patterns) != 1 || rule.Patterns[0] != "spam@example.com" {
+		t.Fatalf("expected sender in blacklist patterns, got %#v", rule.Patterns)
+	}
+
+	rule, added = addSenderToDefaultFilterRuleNoLock("blacklist", "SPAM@example.com")
+	if added {
+		t.Fatalf("expected duplicate sender to be ignored")
+	}
+	if len(rule.Patterns) != 1 {
+		t.Fatalf("expected duplicate sender to keep one pattern, got %#v", rule.Patterns)
+	}
+
+	if len(config.FilterRules) != 2 {
+		t.Fatalf("expected both default sender rules to exist, got %d", len(config.FilterRules))
+	}
+}

models.go

@@ -32,7 +32,6 @@ type ForwardRule struct {
 	Name          string   `json:"name"`
 	SourceAccount string   `json:"source_account"`  // 邮箱账号ID，"all" 表示所有
 	TargetWebhook string   `json:"target_webhook"`  // Webhook目标ID
-	Filters       []string `json:"filters"`         // 主题关键词过滤
 	FilterRuleIDs []string `json:"filter_rule_ids"` // 独立过滤规则ID
 	Enabled       bool     `json:"enabled"`
 }

processor.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"strings"
 	"time"
 )
 
@@ -61,20 +60,6 @@ func processPendingMessages() {
 				continue
 			}
 
-			// 检查关键词过滤
-			if len(rule.Filters) > 0 {
-				matched := false
-				for _, f := range rule.Filters {
-					if strings.Contains(strings.ToLower(msg.Subject), strings.ToLower(f)) {
-						matched = true
-						break
-					}
-				}
-				if !matched {
-					continue
-				}
-			}
-
 			filterResult := applyFilterRules(rule.FilterRuleIDs, filterRules, &msg)
 			if !filterResult.Allowed {
 				filterBlocked = true