✨ Fix breaking changes due to lexicon changes

bluesky-social · Nov 15, 2024 · e6daafb · e6daafb
1 parent 1ae6c0d
commit e6daafb
Show file tree

Hide file tree

Showing 9 changed files with 212 additions and 9 deletions.
diff --git a/api/chat/convodefs.go b/api/chat/convodefs.go
diff --git a/api/ozone/moderationdefs.go b/api/ozone/moderationdefs.go
diff --git a/api/ozone/moderationqueryStatuses.go b/api/ozone/moderationqueryStatuses.go
diff --git a/api/ozone/settingdefs.go b/api/ozone/settingdefs.go
diff --git a/api/ozone/settinglistOptions.go b/api/ozone/settinglistOptions.go
diff --git a/api/ozone/settingremoveOptions.go b/api/ozone/settingremoveOptions.go
diff --git a/api/ozone/settingupsertOption.go b/api/ozone/settingupsertOption.go
diff --git a/automod/engine/reroute.go b/automod/engine/reroute.go
@@ -14,8 +14,8 @@ func (eng *Engine) RerouteAccountEventToOzone(c context.Context, e *comatproto.S
 		ModerationDefs_AccountEvent: &toolsozone.ModerationDefs_AccountEvent{
 			Comment:   &comment,
 			Timestamp: e.Time,
-			Status:    *e.Status,
-			Active:    &e.Active,
+			Status:    e.Status,
+			Active:    e.Active,
 		},
 	}, toolsozone.ModerationEmitEvent_Input_Subject{
 		AdminDefs_RepoRef: &comatproto.AdminDefs_RepoRef{
@@ -118,6 +118,7 @@ func (eng *Engine) IsDuplicatingEvent(ctx context.Context, event toolsozone.Mode
 		xrpcc,
 		nil,
 		nil,
+		[]string{},
 		"",
 		time.Now().Add(-time.Minute*5).Format(time.RFC3339),
 		"",
@@ -131,6 +132,7 @@ func (eng *Engine) IsDuplicatingEvent(ctx context.Context, event toolsozone.Mode
 		nil,
 		"",
 		eventSubject,
+		"",
 		[]string{eventType},
 	)
 

diff --git a/automod/rules/mod_event.go b/automod/rules/mod_event.go
@@ -2,6 +2,7 @@ package rules
 
 import (
 	"github.com/bluesky-social/indigo/automod"
+	"github.com/labstack/gommon/log"
 )
 
 var _ automod.OzoneEventRuleFunc = CountModEventRule
@@ -14,6 +15,7 @@ func CountModEventRule(c *automod.OzoneEventContext) error {
 	}
 
 	c.Increment("mod-event", counterKey)
+	log.Print("mod-event", counterKey, c.GetCount("mod-event", counterKey, automod.PeriodTotal))
 
 	return nil
 }