@atproto/ozone 0.1.53 → 0.1.54

package/src/mod-service/views.ts

@@ -1,6 +1,10 @@
 import { sql } from 'kysely'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
-import { AtpAgent, AppBskyFeedDefs } from '@atproto/api'
+import {
+  AtpAgent,
+  AppBskyFeedDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
 import { dedupeStrs } from '@atproto/common'
 import { BlobRef } from '@atproto/lexicon'
 import { Keypair } from '@atproto/crypto'
@@ -195,6 +199,25 @@ export class ModerationViews {
       eventView.event.remove = event.removedTags || []
     }
 
+    if (event.action === 'tools.ozone.moderation.defs#accountEvent') {
+      eventView.event.active = !!event.meta?.active
+      eventView.event.timestamp = event.meta?.timestamp
+      eventView.event.status = event.meta?.status
+    }
+
+    if (event.action === 'tools.ozone.moderation.defs#identityEvent') {
+      eventView.event.timestamp = event.meta?.timestamp
+      eventView.event.handle = event.meta?.handle
+      eventView.event.pdsHost = event.meta?.pdsHost
+      eventView.event.tombstone = !!event.meta?.tombstone
+    }
+
+    if (event.action === 'tools.ozone.moderation.defs#recordEvent') {
+      eventView.event.op = event.meta?.op
+      eventView.event.cid = event.meta?.cid
+      eventView.event.timestamp = event.meta?.timestamp
+    }
+
     return eventView
   }
 
@@ -574,7 +597,7 @@ export class ModerationViews {
   formatSubjectStatus(
     status: ModerationSubjectStatusRowWithHandle,
   ): SubjectStatusView {
-    return {
+    const statusView: SubjectStatusView = {
       id: status.id,
       reviewState: status.reviewState,
       createdAt: status.createdAt,
@@ -594,6 +617,26 @@ export class ModerationViews {
       tags: status.tags || [],
       subject: subjectFromStatusRow(status).lex(),
     }
+
+    if (status.recordPath !== '') {
+      statusView.hosting = {
+        $type: 'tools.ozone.moderation.defs#recordHosting',
+        updatedAt: status.hostingUpdatedAt ?? undefined,
+        deletedAt: status.hostingDeletedAt ?? undefined,
+        status: status.hostingStatus ?? 'unknown',
+      }
+    } else {
+      statusView.hosting = {
+        $type: 'tools.ozone.moderation.defs#accountHosting',
+        updatedAt: status.hostingUpdatedAt ?? undefined,
+        deletedAt: status.hostingDeletedAt ?? undefined,
+        status: status.hostingStatus ?? 'unknown',
+        deactivatedAt: status.hostingDeactivatedAt ?? undefined,
+        reactivatedAt: status.hostingReactivatedAt ?? undefined,
+      }
+    }
+
+    return statusView
   }
 
   async fetchAuthorFeed(

package/src/setting/service.ts

@@ -0,0 +1,148 @@
+import Database from '../db'
+import { Selectable } from 'kysely'
+import { Option } from '../lexicon/types/tools/ozone/setting/defs'
+import { Setting, SettingScope } from '../db/schema/setting'
+import { Member } from '../db/schema/member'
+import assert from 'node:assert'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+
+export type SettingServiceCreator = (db: Database) => SettingService
+
+export class SettingService {
+  constructor(public db: Database) {}
+
+  static creator() {
+    return (db: Database) => new SettingService(db)
+  }
+
+  async query({
+    limit = 100,
+    scope,
+    did,
+    cursor,
+    prefix,
+    keys,
+  }: {
+    limit: number
+    scope?: 'personal' | 'instance'
+    did?: string
+    cursor?: string
+    prefix?: string
+    keys?: string[]
+  }): Promise<{
+    options: Selectable<Setting>[]
+    cursor?: string
+  }> {
+    let builder = this.db.db.selectFrom('setting').selectAll()
+
+    if (prefix) {
+      builder = builder.where('key', 'like', `${prefix}%`)
+    } else if (keys?.length) {
+      builder = builder.where('key', 'in', keys)
+    }
+
+    if (scope) {
+      builder = builder.where('scope', '=', scope)
+    }
+
+    if (did) {
+      builder = builder.where('did', '=', did)
+    }
+
+    if (cursor) {
+      const cursorId = parseInt(cursor, 10)
+      if (isNaN(cursorId)) {
+        throw new InvalidRequestError('invalid cursor')
+      }
+      builder = builder.where('id', '<', cursorId)
+    }
+
+    const options = await builder.orderBy('id', 'desc').limit(limit).execute()
+
+    return {
+      options,
+      cursor: options[options.length - 1]?.id.toString(),
+    }
+  }
+
+  async upsert(
+    option: Omit<Setting, 'id' | 'createdAt' | 'updatedAt'> & {
+      createdAt: Date
+      updatedAt: Date
+    },
+  ): Promise<void> {
+    await this.db.db
+      .insertInto('setting')
+      .values(option)
+      .onConflict((oc) => {
+        return oc.columns(['key', 'scope', 'did']).doUpdateSet({
+          value: option.value,
+          updatedAt: option.updatedAt,
+          description: option.description,
+          managerRole: option.managerRole,
+          lastUpdatedBy: option.lastUpdatedBy,
+        })
+      })
+      .execute()
+  }
+
+  async removeOptions(
+    keys: string[],
+    filters: {
+      did?: string
+      scope: SettingScope
+      managerRole: Member['role'][]
+    },
+  ): Promise<void> {
+    if (!keys.length) return
+
+    if (filters.scope === 'personal') {
+      assert(filters.did, 'did is required for personal scope')
+    }
+
+    let qb = this.db.db
+      .deleteFrom('setting')
+      .where('key', 'in', keys)
+      .where('scope', '=', filters.scope)
+
+    if (filters.managerRole.length) {
+      qb = qb.where('managerRole', 'in', filters.managerRole)
+    } else {
+      qb = qb.where('managerRole', 'is', null)
+    }
+
+    if (filters.did) {
+      qb = qb.where('did', '=', filters.did)
+    }
+
+    await qb.execute()
+  }
+
+  view(setting: Selectable<Setting>): Option {
+    const {
+      key,
+      value,
+      did,
+      description,
+      createdAt,
+      createdBy,
+      updatedAt,
+      lastUpdatedBy,
+      managerRole,
+      scope,
+    } = setting
+
+    return {
+      key,
+      value,
+      did,
+      scope,
+      createdBy,
+      lastUpdatedBy,
+      managerRole: managerRole || undefined,
+      description: description || undefined,
+      createdAt: createdAt.toISOString(),
+      updatedAt: updatedAt.toISOString(),
+    }
+  }
+}

package/tests/__snapshots__/get-record.test.ts.snap

@@ -29,6 +29,10 @@ Object {
   "moderation": Object {
     "subjectStatus": Object {
       "createdAt": "1970-01-01T00:00:00.000Z",
+      "hosting": Object {
+        "$type": "tools.ozone.moderation.defs#recordHosting",
+        "status": "unknown",
+      },
       "id": 1,
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",
@@ -129,6 +133,10 @@ Object {
   "moderation": Object {
     "subjectStatus": Object {
       "createdAt": "1970-01-01T00:00:00.000Z",
+      "hosting": Object {
+        "$type": "tools.ozone.moderation.defs#recordHosting",
+        "status": "unknown",
+      },
       "id": 1,
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-records.test.ts.snap

@@ -32,6 +32,10 @@ Object {
       "moderation": Object {
         "subjectStatus": Object {
           "createdAt": "1970-01-01T00:00:00.000Z",
+          "hosting": Object {
+            "$type": "tools.ozone.moderation.defs#recordHosting",
+            "status": "unknown",
+          },
           "id": 1,
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-repo.test.ts.snap

@@ -23,6 +23,10 @@ Object {
   "moderation": Object {
     "subjectStatus": Object {
       "createdAt": "1970-01-01T00:00:00.000Z",
+      "hosting": Object {
+        "$type": "tools.ozone.moderation.defs#accountHosting",
+        "status": "unknown",
+      },
       "id": 1,
       "lastReportedAt": "1970-01-01T00:00:00.000Z",
       "lastReviewedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/get-repos.test.ts.snap

@@ -26,6 +26,10 @@ Object {
       "moderation": Object {
         "subjectStatus": Object {
           "createdAt": "1970-01-01T00:00:00.000Z",
+          "hosting": Object {
+            "$type": "tools.ozone.moderation.defs#accountHosting",
+            "status": "unknown",
+          },
           "id": 1,
           "lastReportedAt": "1970-01-01T00:00:00.000Z",
           "lastReviewedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/moderation-events.test.ts.snap

@@ -19,6 +19,10 @@ Object {
     "moderation": Object {
       "subjectStatus": Object {
         "createdAt": "1970-01-01T00:00:00.000Z",
+        "hosting": Object {
+          "$type": "tools.ozone.moderation.defs#accountHosting",
+          "status": "unknown",
+        },
         "id": 1,
         "lastReportedAt": "1970-01-01T00:00:00.000Z",
         "lastReviewedAt": "1970-01-01T00:00:00.000Z",

package/tests/__snapshots__/moderation-statuses.test.ts.snap

@@ -4,6 +4,10 @@ exports[`moderation-statuses query statuses returns statuses filtered by subject
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#recordHosting",
+      "status": "unknown",
+    },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
@@ -23,6 +27,10 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#accountHosting",
+      "status": "unknown",
+    },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
@@ -46,6 +54,10 @@ exports[`moderation-statuses query statuses returns statuses for subjects that r
 Array [
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#recordHosting",
+      "status": "unknown",
+    },
     "id": 7,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
@@ -65,6 +77,10 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#accountHosting",
+      "status": "unknown",
+    },
     "id": 5,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
@@ -83,6 +99,10 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#recordHosting",
+      "status": "unknown",
+    },
     "id": 3,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",
@@ -101,6 +121,10 @@ Array [
   },
   Object {
     "createdAt": "1970-01-01T00:00:00.000Z",
+    "hosting": Object {
+      "$type": "tools.ozone.moderation.defs#accountHosting",
+      "status": "unknown",
+    },
     "id": 1,
     "lastReportedAt": "1970-01-01T00:00:00.000Z",
     "reviewState": "tools.ozone.moderation.defs#reviewOpen",

package/tests/__snapshots__/settings.test.ts.snap

@@ -0,0 +1,52 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ozone-settings listOptions returns all personal settings 1`] = `
+Array [
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(1)",
+    "description": "List of external labelers that will be plugged into the client views",
+    "did": "user(1)",
+    "key": "tools.ozone.setting.client.externalLabelers",
+    "lastUpdatedBy": "user(1)",
+    "managerRole": "tools.ozone.team.defs#roleAdmin",
+    "scope": "instance",
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+    "value": Object {
+      "dids": Array [
+        "user(0)",
+      ],
+    },
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(1)",
+    "description": "This determines how each queue is balanced when sorted by oldest first",
+    "did": "user(1)",
+    "key": "tools.ozone.setting.client.queueHash",
+    "lastUpdatedBy": "user(1)",
+    "managerRole": "tools.ozone.team.defs#roleAdmin",
+    "scope": "instance",
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+    "value": Object {
+      "val": 10.5,
+    },
+  },
+  Object {
+    "createdAt": "1970-01-01T00:00:00.000Z",
+    "createdBy": "user(1)",
+    "description": "This determines how many queues the client interface will show",
+    "did": "user(1)",
+    "key": "tools.ozone.setting.client.queues",
+    "lastUpdatedBy": "user(1)",
+    "managerRole": "tools.ozone.team.defs#roleAdmin",
+    "scope": "instance",
+    "updatedAt": "1970-01-01T00:00:00.000Z",
+    "value": Object {
+      "stratosphere": Object {
+        "name": "Stratosphere",
+      },
+    },
+  },
+]
+`;

package/tests/record-and-account-events.test.ts

@@ -0,0 +1,185 @@
+import {
+  TestNetwork,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import {
+  ComAtprotoModerationDefs,
+  ToolsOzoneModerationDefs,
+} from '@atproto/api'
+import { REVIEWOPEN } from '../src/lexicon/types/tools/ozone/moderation/defs'
+import { ToolsOzoneModerationEmitEvent as EmitModerationEvent } from '@atproto/api'
+describe('record and account events on moderation subjects', () => {
+  let network: TestNetwork
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_record_and_account_events',
+    })
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  const getSubjectStatus = async (
+    subject: string,
+  ): Promise<ToolsOzoneModerationDefs.SubjectStatusView | undefined> => {
+    const res = await modClient.queryStatuses({
+      subject,
+    })
+    return res.subjectStatuses[0]
+  }
+
+  describe('record events', () => {
+    const emitRecordEvent = async (
+      subject: EmitModerationEvent.InputSchema['subject'],
+      op: 'create' | 'update' | 'delete',
+    ) => {
+      return await modClient.emitEvent(
+        {
+          event: {
+            op,
+            timestamp: new Date().toISOString(),
+            $type: 'tools.ozone.moderation.defs#recordEvent',
+          },
+          subject,
+          createdBy: 'did:example:admin',
+        },
+        'admin',
+      )
+    }
+
+    it('saves updated and deleted timestamps and record status', async () => {
+      const bobsPostSubject = {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.bob][1].ref.uriStr,
+        cid: sc.posts[sc.dids.bob][1].ref.cidStr,
+      }
+
+      await sc.createReport({
+        reportedBy: sc.dids.carol,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: bobsPostSubject,
+      })
+
+      await emitRecordEvent(bobsPostSubject, 'update')
+      const statusAfterUpdate = await getSubjectStatus(bobsPostSubject.uri)
+      expect(statusAfterUpdate?.hosting?.updatedAt).toBeTruthy()
+
+      await emitRecordEvent(bobsPostSubject, 'delete')
+      const statusAfterDelete = await getSubjectStatus(bobsPostSubject.uri)
+      expect(statusAfterDelete?.hosting?.deletedAt).toBeTruthy()
+      expect(statusAfterDelete?.hosting?.status).toEqual('deleted')
+      // Ensure that due to delete or update event, review state does not change
+      expect(statusAfterDelete?.reviewState).toEqual(REVIEWOPEN)
+    })
+  })
+  describe('account/identity events', () => {
+    const emitAccountEvent = async (
+      subject: EmitModerationEvent.InputSchema['subject'],
+      active: boolean,
+      status?: 'takendown' | 'deleted' | 'deactivated' | 'suspended',
+    ) => {
+      return await modClient.emitEvent(
+        {
+          event: {
+            status,
+            active,
+            timestamp: new Date().toISOString(),
+            $type: 'tools.ozone.moderation.defs#accountEvent',
+          },
+          subject,
+          createdBy: 'did:example:admin',
+        },
+        'admin',
+      )
+    }
+
+    it('saves updated and deleted timestamps and account status', async () => {
+      const carolsAccountSubject = {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.carol,
+      }
+
+      await sc.createReport({
+        reportedBy: sc.dids.carol,
+        reasonType: ComAtprotoModerationDefs.REASONMISLEADING,
+        reason: 'misleading',
+        subject: carolsAccountSubject,
+      })
+
+      await emitAccountEvent(carolsAccountSubject, false, 'deactivated')
+      const statusAfterDeactivation = await getSubjectStatus(
+        carolsAccountSubject.did,
+      )
+      expect(statusAfterDeactivation?.hosting?.deactivatedAt).toBeTruthy()
+      expect(statusAfterDeactivation?.hosting?.status).toEqual('deactivated')
+      expect(statusAfterDeactivation?.reviewState).toEqual(REVIEWOPEN)
+
+      await emitAccountEvent(carolsAccountSubject, true)
+      const statusAfterReactivation = await getSubjectStatus(
+        carolsAccountSubject.did,
+      )
+      expect(statusAfterReactivation?.hosting?.updatedAt).toBeTruthy()
+      expect(statusAfterReactivation?.hosting?.status).toEqual('active')
+      expect(statusAfterReactivation?.hosting?.deletedAt).toBeFalsy()
+    })
+
+    it('gets statuses by hosting properties', async () => {
+      await Promise.all([
+        emitAccountEvent(
+          {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: sc.dids.carol,
+          },
+          false,
+          'deactivated',
+        ),
+        emitAccountEvent(
+          {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: sc.dids.bob,
+          },
+          false,
+          'deleted',
+        ),
+      ])
+      const [
+        { subjectStatuses: deactivatedOrDeletedStatuses },
+        { subjectStatuses: deletedStatusesInPastDay },
+        { subjectStatuses: deletedStatusesBeforeYesterday },
+      ] = await Promise.all([
+        modClient.queryStatuses({
+          hostingStatuses: ['deactivated', 'deleted'],
+        }),
+        modClient.queryStatuses({
+          hostingDeletedAfter: new Date(
+            Date.now() - 1000 * 60 * 60 * 24,
+          ).toISOString(),
+        }),
+        modClient.queryStatuses({
+          hostingDeletedBefore: new Date(
+            Date.now() - 1000 * 60 * 60 * 24,
+          ).toISOString(),
+        }),
+      ])
+
+      expect(deactivatedOrDeletedStatuses.length).toEqual(3)
+      expect(deletedStatusesInPastDay.length).toEqual(2)
+      expect(deletedStatusesInPastDay[0]?.subject.uri).toEqual(
+        sc.posts[sc.dids.bob][1].ref.uriStr,
+      )
+      expect(deletedStatusesInPastDay[1]?.subject.did).toEqual(sc.dids.bob)
+      expect(deletedStatusesBeforeYesterday.length).toEqual(0)
+    })
+  })
+})