automod: fix label creation/action

bluesky-social · Nov 15, 2023 · cc7e4ba · cc7e4ba
1 parent 0ad1010
commit cc7e4ba
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/automod/engine.go b/automod/engine.go
@@ -98,6 +98,9 @@ func (e *Engine) ProcessRecord(ctx context.Context, did syntax.DID, path, recCID
 		if err := evt.PersistAccountActions(ctx); err != nil {
 			return err
 		}
+		if err := evt.PersistRecordActions(ctx); err != nil {
+			return err
+		}
 		if err := evt.PersistCounters(ctx); err != nil {
 			return err
 		}
@@ -114,6 +117,9 @@ func (e *Engine) ProcessRecord(ctx context.Context, did syntax.DID, path, recCID
 		if err := evt.PersistAccountActions(ctx); err != nil {
 			return err
 		}
+		if err := evt.PersistRecordActions(ctx); err != nil {
+			return err
+		}
 		if err := evt.PersistCounters(ctx); err != nil {
 			return err
 		}

diff --git a/automod/event.go b/automod/event.go
@@ -206,8 +206,9 @@ func (e *RecordEvent) PersistRecordActions(ctx context.Context) error {
 	}
 	xrpcc := e.Engine.AdminClient
 	if len(e.RecordLabels) > 0 {
+		// TODO: this does an action, not just create labels; will update after event refactor
 		_, err := comatproto.AdminTakeModerationAction(ctx, xrpcc, &comatproto.AdminTakeModerationAction_Input{
-			Action:          "com.atproto.admin.defs#createLabels",
+			Action:          "com.atproto.admin.defs#flag",
 			CreateLabelVals: dedupeStrings(e.RecordLabels),
 			Reason:          "automod",
 			CreatedBy:       xrpcc.Auth.Did,

diff --git a/cmd/hepa/server.go b/cmd/hepa/server.go
@@ -54,6 +54,7 @@ func NewServer(dir identity.Directory, config Config) (*Server, error) {
 			Client:     util.RobustHTTPClient(),
 			Host:       config.ModHost,
 			AdminToken: &config.ModAdminToken,
+			Auth:       &xrpc.AuthInfo{},
 		}
 
 		auth, err := comatproto.ServerCreateSession(context.TODO(), xrpcc, &comatproto.ServerCreateSession_Input{