✨ Added count for mod-event and reroute event based on mod-event count

automod/countstore/countstore.go

@@ -48,7 +48,6 @@ type CountStore interface {
 	// TODO: batch increment method
 	GetCountDistinct(ctx context.Context, name, bucket, period string) (int, error)
 	IncrementDistinct(ctx context.Context, name, bucket, val string) error
-	Reset(ctx context.Context, name, val string) error
 }
 
 func periodBucket(name, val, period string) string {

automod/countstore/countstore_mem.go

@@ -40,12 +40,6 @@ func (s MemCountStore) Increment(ctx context.Context, name, val string) error {
 	return nil
 }
 
-func (s *MemCountStore) Reset(ctx context.Context, name, val string) error {
-	key := periodBucket(name, val, PeriodTotal)
-	s.Counts.Delete(key)
-	return nil
-}
-
 func (s MemCountStore) IncrementPeriod(ctx context.Context, name, val, period string) error {
 	k := periodBucket(name, val, period)
 	s.Counts.Compute(k, func(oldVal int, _ bool) (int, bool) {

automod/countstore/countstore_redis.go

@@ -66,18 +66,6 @@ func (s *RedisCountStore) Increment(ctx context.Context, name, val string) error
 	return err
 }
 
-// Deletes a counter key
-func (s *RedisCountStore) Reset(ctx context.Context, name, val string) error {
-	var key string
-
-	// increment multiple counters in a single redis round-trip
-	multi := s.Client.Pipeline()
-	key = redisCountPrefix + periodBucket(name, val, PeriodHour)
-	multi.Del(ctx, key)
-	_, err := multi.Exec(ctx)
-	return err
-}
-
 // Variant of Increment() which only acts on a single specified time period. The intended us of this variant is to control the total number of counters persisted, by using a relatively short time period, for which the counters will expire.
 func (s *RedisCountStore) IncrementPeriod(ctx context.Context, name, val, period string) error {
 

automod/engine/context.go

@@ -243,10 +243,6 @@ func (c *BaseContext) GetAccountMeta(did syntax.DID) *AccountMeta {
 func (c *BaseContext) Increment(name, val string) {
 	c.effects.Increment(name, val)
 }
-
-func (c *BaseContext) ResetCounter(name, val string) {
-	c.effects.ResetCounter(name, val)
-}
 func (c *BaseContext) IncrementDistinct(name, bucket, val string) {
 	c.effects.IncrementDistinct(name, bucket, val)
 }

automod/engine/effects.go

@@ -34,7 +34,6 @@ type Effects struct {
 	mu sync.Mutex
 	// List of counters which should be incremented as part of processing this event. These are collected during rule execution and persisted in bulk at the end.
 	CounterIncrements []CounterRef
-	CounterResets     []CounterRef
 	// Similar to "CounterIncrements", but for "distinct" style counters
 	CounterDistinctIncrements []CounterDistinctRef // TODO: better variable names
 	// Label values which should be applied to the overall account, as a result of rule execution.
@@ -80,16 +79,6 @@ func (e *Effects) IncrementPeriod(name, val string, period string) {
 	e.CounterIncrements = append(e.CounterIncrements, CounterRef{Name: name, Val: val, Period: &period})
 }
 
-// Enqueues the named counter to be reset at the end of all rule processing.
-//
-// "name" is the counter namespace.
-// "val" is the specific counter with that namespace.
-func (e *Effects) ResetCounter(name, val string) {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-	e.CounterResets = append(e.CounterResets, CounterRef{Name: name, Val: val})
-}
-
 // Enqueues the named "distinct value" counter based on the supplied string value ("val") to be incremented at the end of all rule processing. Will automatically increment for all time periods.
 func (e *Effects) IncrementDistinct(name, bucket, val string) {
 	e.mu.Lock()

automod/rules/all.go

@@ -62,7 +62,7 @@ func DefaultRules() automod.RuleSet {
 		},
 		OzoneEventRules: []automod.OzoneEventRuleFunc{
 			HarassmentProtectionOzoneEventRule,
-			MarkAppealOzoneEventRule,
+			CountModEventRule,
 		},
 	}
 	return rules

automod/rules/mod_event.go

@@ -0,0 +1,19 @@
+package rules
+
+import (
+	"github.com/bluesky-social/indigo/automod"
+)
+
+var _ automod.OzoneEventRuleFunc = CountModEventRule
+
+// looks for appeals on records/accounts and flags subjects
+func CountModEventRule(c *automod.OzoneEventContext) error {
+	counterKey := c.Event.SubjectDID.String()
+	if c.Event.SubjectURI != nil {
+		counterKey = c.Event.SubjectURI.String()
+	}
+
+	c.Increment("mod-event", counterKey)
+
+	return nil
+}

automod/rules/ozone_persist.go

@@ -2,7 +2,6 @@ package rules
 
 import (
 	"github.com/bluesky-social/indigo/automod"
-	"github.com/bluesky-social/indigo/automod/countstore"
 )
 
 var _ automod.RecordRuleFunc = OzoneRecordHistoryPersistRule
@@ -12,20 +11,13 @@ func OzoneRecordHistoryPersistRule(c *automod.RecordContext) error {
 	case "app.bsky.labeler.service":
 		c.PersistRecordOzoneEvent()
 	case "app.bsky.feed.post":
-		// @TODO: we should probably persist if a deleted post has reports on it but right now, we are not keeping track of reports on records
 		if c.RecordOp.Action == "delete" {
-			// If a post being deleted has an active appeal, persist the event
-			if c.GetCount("appeal", c.RecordOp.ATURI().String(), countstore.PeriodTotal) > 0 {
+			if c.GetCount("mod-event", c.RecordOp.ATURI().String(), automod.PeriodTotal) > 0 {
 				c.PersistRecordOzoneEvent()
 			}
-
 		}
 	case "app.bsky.actor.profile":
-		hasLabels := len(c.Account.AccountLabels) > 0
-		// If there is an appeal on the account or the profile record
-		// Appeal counts are reset when appeals are resolved so this should only be true when there is an unresolved appeal
-		hasAppeals := c.GetCount("appeal", c.Account.Identity.DID.String(), countstore.PeriodTotal) > 0 || c.GetCount("appeal", c.RecordOp.ATURI().String(), countstore.PeriodTotal) > 0
-		if hasLabels || hasAppeals {
+		if c.GetCount("mod-event", c.RecordOp.ATURI().String(), automod.PeriodTotal) > 0 {
 			c.PersistRecordOzoneEvent()
 		}
 	}