Ozone !takedown labels (#2069)

* add purge labels on takedown

* wire up some cfg

* tests

* fix up tests

* purge -> takedown

* Temporary unspecced labels relating takedowns in ozone (#2101)

temporarily move to unspecced labels relating takedowns

---------

Co-authored-by: devin ivy <devinivy@gmail.com>

packages/ozone/src/api/admin/emitModerationEvent.ts

@@ -92,7 +92,6 @@ export default function (server: Server, ctx: AppContext) {
 
         if (isLabelEvent) {
           await moderationTxn.formatAndCreateLabels(
-            ctx.cfg.service.did,
             result.subjectUri ?? result.subjectDid,
             result.subjectCid,
             {

packages/ozone/src/api/temp/fetchLabels.ts

@@ -1,29 +1,44 @@
 import { Server } from '../../lexicon'
 import AppContext from '../../context'
+import {
+  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
+  UNSPECCED_TAKEDOWN_LABEL,
+} from '../../mod-service/types'
 
 export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.temp.fetchLabels(async ({ params }) => {
-    const { limit } = params
-    const since =
-      params.since !== undefined ? new Date(params.since).toISOString() : ''
-    const labelRes = await ctx.db.db
-      .selectFrom('label')
-      .selectAll()
-      .orderBy('label.cts', 'asc')
-      .where('cts', '>', since)
-      .limit(limit)
-      .execute()
+  server.com.atproto.temp.fetchLabels({
+    auth: ctx.authOptionalAccessOrRoleVerifier,
+    handler: async ({ auth, params }) => {
+      const { limit } = params
+      const since =
+        params.since !== undefined ? new Date(params.since).toISOString() : ''
+      const includeUnspeccedTakedowns =
+        auth.credentials.type === 'role' && auth.credentials.admin
+      const labelRes = await ctx.db.db
+        .selectFrom('label')
+        .selectAll()
+        .orderBy('label.cts', 'asc')
+        .where('cts', '>', since)
+        .if(!includeUnspeccedTakedowns, (q) =>
+          q.where('label.val', 'not in', [
+            UNSPECCED_TAKEDOWN_LABEL,
+            UNSPECCED_TAKEDOWN_BLOBS_LABEL,
+          ]),
+        )
+        .limit(limit)
+        .execute()
 
-    const labels = labelRes.map((l) => ({
-      ...l,
-      cid: l.cid === '' ? undefined : l.cid,
-    }))
+      const labels = labelRes.map((l) => ({
+        ...l,
+        cid: l.cid === '' ? undefined : l.cid,
+      }))
 
-    return {
-      encoding: 'application/json',
-      body: {
-        labels,
-      },
-    }
+      return {
+        encoding: 'application/json',
+        body: {
+          labels,
+        },
+      }
+    },
   })
 }

packages/ozone/src/context.ts

@@ -65,6 +65,7 @@ export class AppContext {
       eventPusher,
       appviewAgent,
       appviewAuth,
+      cfg.service.did,
     )
 
     const communicationTemplateService = CommunicationTemplateService.creator()

packages/ozone/src/daemon/context.ts

@@ -52,6 +52,7 @@ export class DaemonContext {
       eventPusher,
       appviewAgent,
       appviewAuth,
+      cfg.service.did,
     )
     const eventReverser = new EventReverser(db, modService)
 

packages/ozone/src/mod-service/index.ts

@@ -24,6 +24,8 @@ import {
   ModerationEventRow,
   ModerationSubjectStatusRow,
   ReversibleModerationEvent,
+  UNSPECCED_TAKEDOWN_BLOBS_LABEL,
+  UNSPECCED_TAKEDOWN_LABEL,
 } from './types'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { StatusKeyset, TimeIdKeyset, paginate } from '../db/pagination'
@@ -49,13 +51,15 @@ export class ModerationService {
     public eventPusher: EventPusher,
     public appviewAgent: AtpAgent,
     private appviewAuth: AppviewAuth,
+    public serverDid: string,
   ) {}
 
   static creator(
     backgroundQueue: BackgroundQueue,
     eventPusher: EventPusher,
     appviewAgent: AtpAgent,
     appviewAuth: AppviewAuth,
+    serverDid: string,
   ) {
     return (db: Database) =>
       new ModerationService(
@@ -64,6 +68,7 @@ export class ModerationService {
         eventPusher,
         appviewAgent,
         appviewAuth,
+        serverDid,
       )
   }
 
@@ -359,19 +364,25 @@ export class ModerationService {
       subjectDid: subject.did,
       takedownRef,
     }))
-    const repoEvts = await this.db.db
-      .insertInto('repo_push_event')
-      .values(values)
-      .onConflict((oc) =>
-        oc.columns(['subjectDid', 'eventType']).doUpdateSet({
-          takedownRef,
-          confirmedAt: null,
-          attempts: 0,
-          lastAttempted: null,
-        }),
-      )
-      .returning('id')
-      .execute()
+
+    const [repoEvts] = await Promise.all([
+      this.db.db
+        .insertInto('repo_push_event')
+        .values(values)
+        .onConflict((oc) =>
+          oc.columns(['subjectDid', 'eventType']).doUpdateSet({
+            takedownRef,
+            confirmedAt: null,
+            attempts: 0,
+            lastAttempted: null,
+          }),
+        )
+        .returning('id')
+        .execute(),
+      this.formatAndCreateLabels(subject.did, null, {
+        create: [UNSPECCED_TAKEDOWN_LABEL],
+      }),
+    ])
 
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
@@ -383,18 +394,23 @@ export class ModerationService {
   }
 
   async reverseTakedownRepo(subject: RepoSubject) {
-    const repoEvts = await this.db.db
-      .updateTable('repo_push_event')
-      .where('eventType', 'in', TAKEDOWNS)
-      .where('subjectDid', '=', subject.did)
-      .set({
-        takedownRef: null,
-        confirmedAt: null,
-        attempts: 0,
-        lastAttempted: null,
-      })
-      .returning('id')
-      .execute()
+    const [repoEvts] = await Promise.all([
+      this.db.db
+        .updateTable('repo_push_event')
+        .where('eventType', 'in', TAKEDOWNS)
+        .where('subjectDid', '=', subject.did)
+        .set({
+          takedownRef: null,
+          confirmedAt: null,
+          attempts: 0,
+          lastAttempted: null,
+        })
+        .returning('id')
+        .execute(),
+      this.formatAndCreateLabels(subject.did, null, {
+        negate: [UNSPECCED_TAKEDOWN_LABEL],
+      }),
+    ])
 
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
@@ -415,19 +431,27 @@ export class ModerationService {
       subjectCid: subject.cid,
       takedownRef,
     }))
-    const recordEvts = await this.db.db
-      .insertInto('record_push_event')
-      .values(values)
-      .onConflict((oc) =>
-        oc.columns(['subjectUri', 'eventType']).doUpdateSet({
-          takedownRef,
-          confirmedAt: null,
-          attempts: 0,
-          lastAttempted: null,
-        }),
-      )
-      .returning('id')
-      .execute()
+    const blobCids = subject.blobCids
+    const labels: string[] = [UNSPECCED_TAKEDOWN_LABEL]
+    if (blobCids && blobCids.length > 0) {
+      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL)
+    }
+    const [recordEvts] = await Promise.all([
+      this.db.db
+        .insertInto('record_push_event')
+        .values(values)
+        .onConflict((oc) =>
+          oc.columns(['subjectUri', 'eventType']).doUpdateSet({
+            takedownRef,
+            confirmedAt: null,
+            attempts: 0,
+            lastAttempted: null,
+          }),
+        )
+        .returning('id')
+        .execute(),
+      this.formatAndCreateLabels(subject.uri, subject.cid, { create: labels }),
+    ])
 
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
@@ -437,7 +461,6 @@ export class ModerationService {
       })
     })
 
-    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobValues: Insertable<BlobPushEvent>[] = []
       for (const eventType of TAKEDOWNS) {
@@ -478,19 +501,27 @@ export class ModerationService {
 
   async reverseTakedownRecord(subject: RecordSubject) {
     this.db.assertTransaction()
-    const recordEvts = await this.db.db
-      .updateTable('record_push_event')
-      .where('eventType', 'in', TAKEDOWNS)
-      .where('subjectDid', '=', subject.did)
-      .where('subjectUri', '=', subject.uri)
-      .set({
-        takedownRef: null,
-        confirmedAt: null,
-        attempts: 0,
-        lastAttempted: null,
-      })
-      .returning('id')
-      .execute()
+    const labels: string[] = [UNSPECCED_TAKEDOWN_LABEL]
+    const blobCids = subject.blobCids
+    if (blobCids && blobCids.length > 0) {
+      labels.push(UNSPECCED_TAKEDOWN_BLOBS_LABEL)
+    }
+    const [recordEvts] = await Promise.all([
+      this.db.db
+        .updateTable('record_push_event')
+        .where('eventType', 'in', TAKEDOWNS)
+        .where('subjectDid', '=', subject.did)
+        .where('subjectUri', '=', subject.uri)
+        .set({
+          takedownRef: null,
+          confirmedAt: null,
+          attempts: 0,
+          lastAttempted: null,
+        })
+        .returning('id')
+        .execute(),
+      this.formatAndCreateLabels(subject.uri, subject.cid, { negate: labels }),
+    ])
     this.db.onCommit(() => {
       this.backgroundQueue.add(async () => {
         await Promise.all(
@@ -499,7 +530,6 @@ export class ModerationService {
       })
     })
 
-    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobEvts = await this.db.db
         .updateTable('blob_push_event')
@@ -695,22 +725,21 @@ export class ModerationService {
   }
 
   async formatAndCreateLabels(
-    src: string,
     uri: string,
     cid: string | null,
     labels: { create?: string[]; negate?: string[] },
   ): Promise<Label[]> {
     const { create = [], negate = [] } = labels
     const toCreate = create.map((val) => ({
-      src,
+      src: this.serverDid,
       uri,
       cid: cid ?? undefined,
       val,
       neg: false,
       cts: new Date().toISOString(),
     }))
     const toNegate = negate.map((val) => ({
-      src,
+      src: this.serverDid,
       uri,
       cid: cid ?? undefined,
       val,

packages/ozone/src/mod-service/types.ts

@@ -30,3 +30,7 @@ export type ModEventType =
   | ComAtprotoAdminDefs.ModEventReport
   | ComAtprotoAdminDefs.ModEventMute
   | ComAtprotoAdminDefs.ModEventReverseTakedown
+
+export const UNSPECCED_TAKEDOWN_LABEL = '!unspecced-takedown'
+
+export const UNSPECCED_TAKEDOWN_BLOBS_LABEL = '!unspecced-takedown-blobs'

packages/ozone/tests/__snapshots__/get-record.test.ts.snap

@@ -7,6 +7,14 @@ Object {
   "cid": "cids(0)",
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [
+    Object {
+      "cid": "cids(0)",
+      "cts": "1970-01-01T00:00:00.000Z",
+      "neg": false,
+      "src": "user(1)",
+      "uri": "record(0)",
+      "val": "!unspecced-takedown",
+    },
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",
@@ -93,6 +101,14 @@ Object {
   "cid": "cids(0)",
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "labels": Array [
+    Object {
+      "cid": "cids(0)",
+      "cts": "1970-01-01T00:00:00.000Z",
+      "neg": false,
+      "src": "user(1)",
+      "uri": "record(0)",
+      "val": "!unspecced-takedown",
+    },
     Object {
       "cid": "cids(0)",
       "cts": "1970-01-01T00:00:00.000Z",

packages/ozone/tests/__snapshots__/get-repo.test.ts.snap

@@ -8,7 +8,15 @@ Object {
   "indexedAt": "1970-01-01T00:00:00.000Z",
   "invites": Array [],
   "invitesDisabled": false,
-  "labels": Array [],
+  "labels": Array [
+    Object {
+      "cts": "1970-01-01T00:00:00.000Z",
+      "neg": false,
+      "src": "user(1)",
+      "uri": "user(0)",
+      "val": "!unspecced-takedown",
+    },
+  ],
   "moderation": Object {
     "subjectStatus": Object {
       "createdAt": "1970-01-01T00:00:00.000Z",

packages/ozone/tests/moderation-appeals.test.ts

@@ -39,7 +39,7 @@ describe('moderation-appeals', () => {
 
   beforeAll(async () => {
     network = await TestNetwork.create({
-      dbPostgresSchema: 'ozone_moderation_statuses',
+      dbPostgresSchema: 'ozone_moderation_appeals',
     })
     agent = network.ozone.getClient()
     pdsAgent = network.pds.getClient()