@atproto/ozone 0.0.7 → 0.0.9

package/src/lexicon/types/com/atproto/temp/transferAccount.ts

@@ -6,7 +6,7 @@ import { ValidationResult, BlobRef } from '@atproto/lexicon'
 import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
-import { HandlerAuth } from '@atproto/xrpc-server'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 
 export interface QueryParams {}
 
@@ -49,7 +49,7 @@ export interface HandlerError {
     | 'IncompatibleDidDoc'
 }
 
-export type HandlerOutput = HandlerError | HandlerSuccess
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   auth: HA
   params: QueryParams

package/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'
@@ -39,6 +41,7 @@ import {
 import { BlobPushEvent } from '../db/schema/blob_push_event'
 import { BackgroundQueue } from '../background'
 import { EventPusher } from '../daemon'
+import { jsonb } from '../db/types'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 
@@ -49,6 +52,7 @@ export class ModerationService {
     public eventPusher: EventPusher,
     public appviewAgent: AtpAgent,
     private appviewAuth: AppviewAuth,
+    public serverDid: string,
   ) {}
 
   static creator(
@@ -56,6 +60,7 @@ export class ModerationService {
     eventPusher: EventPusher,
     appviewAgent: AtpAgent,
     appviewAuth: AppviewAuth,
+    serverDid: string,
   ) {
     return (db: Database) =>
       new ModerationService(
@@ -64,6 +69,7 @@ export class ModerationService {
         eventPusher,
         appviewAgent,
         appviewAuth,
+        serverDid,
       )
   }
 
@@ -91,6 +97,13 @@ export class ModerationService {
     includeAllUserRecords: boolean
     types: ModerationEvent['action'][]
     sortDirection?: 'asc' | 'desc'
+    hasComment?: boolean
+    comment?: string
+    createdAfter?: string
+    createdBefore?: string
+    addedLabels: string[]
+    removedLabels: string[]
+    reportTypes?: string[]
   }): Promise<{ cursor?: string; events: ModerationEventRow[] }> {
     const {
       subject,
@@ -100,6 +113,13 @@ export class ModerationService {
       includeAllUserRecords,
       sortDirection = 'desc',
       types,
+      hasComment,
+      comment,
+      createdAfter,
+      createdBefore,
+      addedLabels,
+      removedLabels,
+      reportTypes,
     } = opts
     let builder = this.db.db.selectFrom('moderation_event').selectAll()
     if (subject) {
@@ -134,6 +154,33 @@ export class ModerationService {
     if (createdBy) {
       builder = builder.where('createdBy', '=', createdBy)
     }
+    if (createdAfter) {
+      builder = builder.where('createdAt', '>=', createdAfter)
+    }
+    if (createdBefore) {
+      builder = builder.where('createdAt', '<=', createdBefore)
+    }
+    if (comment) {
+      builder = builder.where('comment', 'ilike', `%${comment}%`)
+    }
+    if (hasComment) {
+      builder = builder.where('comment', 'is not', null)
+    }
+
+    // If multiple labels are passed, then only retrieve events where all those labels exist
+    if (addedLabels.length) {
+      addedLabels.forEach((label) => {
+        builder = builder.where('createLabelVals', 'ilike', `%${label}%`)
+      })
+    }
+    if (removedLabels.length) {
+      removedLabels.forEach((label) => {
+        builder = builder.where('negateLabelVals', 'ilike', `%${label}%`)
+      })
+    }
+    if (reportTypes?.length) {
+      builder = builder.where(sql`meta->>'reportType'`, 'in', reportTypes)
+    }
 
     const { ref } = this.db.db.dynamic
     const keyset = new TimeIdKeyset(
@@ -218,6 +265,8 @@ export class ModerationService {
       meta.subjectLine = event.subjectLine
     }
 
+    const subjectInfo = subject.info()
+
     const modEvent = await this.db.db
       .insertInto('moderation_event')
       .values({
@@ -236,7 +285,11 @@ export class ModerationService {
           event.durationInHours
             ? addHoursToDate(event.durationInHours, createdAt).toISOString()
             : undefined,
-        ...subject.info(),
+        subjectType: subjectInfo.subjectType,
+        subjectDid: subjectInfo.subjectDid,
+        subjectUri: subjectInfo.subjectUri,
+        subjectCid: subjectInfo.subjectCid,
+        subjectBlobCids: jsonb(subjectInfo.subjectBlobCids),
       })
       .returningAll()
       .executeTakeFirstOrThrow()
@@ -359,19 +412,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 +442,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 +479,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 +509,6 @@ export class ModerationService {
       })
     })
 
-    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobValues: Insertable<BlobPushEvent>[] = []
       for (const eventType of TAKEDOWNS) {
@@ -478,19 +549,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 +578,6 @@ export class ModerationService {
       })
     })
 
-    const blobCids = subject.blobCids
     if (blobCids && blobCids.length > 0) {
       const blobEvts = await this.db.db
         .updateTable('blob_push_event')
@@ -683,26 +761,26 @@ export class ModerationService {
     }
   }
 
-  async isSubjectTakendown(subject: ModSubject): Promise<boolean> {
-    const builder = this.db.db
+  async getStatus(
+    subject: ModSubject,
+  ): Promise<ModerationSubjectStatusRow | null> {
+    const result = await this.db.db
       .selectFrom('moderation_subject_status')
       .where('did', '=', subject.did)
-      .where('recordPath', '=', subject.recordPath || '')
-
-    const result = await builder.select('takendown').executeTakeFirst()
-
-    return !!result?.takendown
+      .where('recordPath', '=', subject.recordPath ?? '')
+      .selectAll()
+      .executeTakeFirst()
+    return result ?? null
   }
 
   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,
@@ -710,7 +788,7 @@ export class ModerationService {
       cts: new Date().toISOString(),
     }))
     const toNegate = negate.map((val) => ({
-      src,
+      src: this.serverDid,
       uri,
       cid: cid ?? undefined,
       val,

package/src/mod-service/status.ts

@@ -12,6 +12,7 @@ import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 import { HOUR } from '@atproto/common'
 import { sql } from 'kysely'
 import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
+import { jsonb } from '../db/types'
 
 const getSubjectStatusForModerationEvent = ({
   action,
@@ -191,9 +192,9 @@ export const adjustModerationSubjectStatus = async (
   }
 
   if (blobCids?.length) {
-    const newBlobCids = sql<string[]>`${JSON.stringify(
+    const newBlobCids = jsonb(
       blobCids,
-    )}` as unknown as ModerationSubjectStatusRow['blobCids']
+    ) as unknown as ModerationSubjectStatusRow['blobCids']
     newStatus.blobCids = newBlobCids
     subjectStatus.blobCids = newBlobCids
   }

package/src/mod-service/subject.ts

@@ -37,7 +37,11 @@ export const subjectFromEventRow = (row: ModerationEventRow): ModSubject => {
     row.subjectUri &&
     row.subjectCid
   ) {
-    return new RecordSubject(row.subjectUri, row.subjectCid)
+    return new RecordSubject(
+      row.subjectUri,
+      row.subjectCid,
+      row.subjectBlobCids ?? [],
+    )
   } else {
     return new RepoSubject(row.subjectDid)
   }
@@ -50,7 +54,7 @@ export const subjectFromStatusRow = (
     // Not too intuitive but the recordpath is basically <collection>/<rkey>
     // which is what the last 2 params of .make() arguments are
     const uri = AtUri.make(row.did, ...row.recordPath.split('/')).toString()
-    return new RecordSubject(uri.toString(), row.recordCid)
+    return new RecordSubject(uri.toString(), row.recordCid, row.blobCids ?? [])
   } else {
     return new RepoSubject(row.did)
   }
@@ -61,6 +65,7 @@ type SubjectInfo = {
   subjectDid: string
   subjectUri: string | null
   subjectCid: string | null
+  subjectBlobCids: string[] | null
 }
 
 export interface ModSubject {
@@ -89,6 +94,7 @@ export class RepoSubject implements ModSubject {
       subjectDid: this.did,
       subjectUri: null,
       subjectCid: null,
+      subjectBlobCids: null,
     }
   }
   lex(): RepoRef {
@@ -124,6 +130,7 @@ export class RecordSubject implements ModSubject {
       subjectDid: this.did,
       subjectUri: this.uri,
       subjectCid: this.cid,
+      subjectBlobCids: this.blobCids ?? [],
     }
   }
   lex(): StrongRef {

package/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'

package/src/mod-service/views.ts

@@ -88,7 +88,7 @@ export class ModerationViews {
         comment: event.comment ?? undefined,
       },
       subject: subjectFromEventRow(event).lex(),
-      subjectBlobCids: [],
+      subjectBlobCids: event.subjectBlobCids ?? [],
       createdBy: event.createdBy,
       createdAt: event.createdAt,
       subjectHandle: event.subjectHandle ?? undefined,

package/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",

package/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",

package/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()