@atproto/ozone 0.1.46 → 0.1.48

package/src/mod-service/views.ts

@@ -223,25 +223,33 @@ export class ModerationViews {
     }
   }
 
-  async repoDetail(
-    did: string,
+  async repoDetails(
+    dids: string[],
     labelers?: ParsedLabelers,
-  ): Promise<RepoViewDetail | undefined> {
+  ): Promise<Map<string, RepoView>> {
+    const results = new Map<string, RepoView>()
     const [repos, localLabels, externalLabels] = await Promise.all([
-      this.repos([did]),
-      this.labels(did),
-      this.getExternalLabels([did], labelers),
+      this.repos(dids),
+      this.labels(dids),
+      this.getExternalLabels(dids, labelers),
     ])
-    const repo = repos.get(did)
-    if (!repo) return
 
-    return {
-      ...repo,
-      moderation: {
-        ...repo.moderation,
-      },
-      labels: [...localLabels, ...externalLabels],
-    }
+    repos.forEach((repo, did) => {
+      const labels = [
+        ...(localLabels.get(did) || []),
+        ...(externalLabels.get(did) || []),
+      ]
+      const repoView = {
+        ...repo,
+        labels,
+        moderation: {
+          ...repo.moderation,
+        },
+      }
+      results.set(did, repoView)
+    })
+
+    return results
   }
 
   async fetchRecords(
@@ -308,47 +316,59 @@ export class ModerationViews {
     }, new Map<string, RecordView>())
   }
 
-  async recordDetail(
-    subject: RecordSubject,
+  async recordDetails(
+    subjects: RecordSubject[],
     labelers?: ParsedLabelers,
-  ): Promise<RecordViewDetail | undefined> {
-    const [records, subjectStatusesResult] = await Promise.all([
-      this.records([subject]),
-      this.getSubjectStatus([subject.uri]),
-    ])
-    const record = records.get(subject.uri)
-    if (!record) return undefined
+  ): Promise<Map<string, RecordViewDetail>> {
+    const subjectUris = subjects.map((s) => s.uri)
+    const [records, subjectStatusesResult, localLabels, externalLabels] =
+      await Promise.all([
+        this.records(subjects),
+        this.getSubjectStatus(subjectUris),
+        this.labels(subjectUris),
+        this.getExternalLabels(subjectUris, labelers),
+      ])
+
+    const results = new Map<string, RecordViewDetail>()
+
+    await Promise.all(
+      Array.from(records.entries()).map(async ([uri, record]) => {
+        const selfLabels = getSelfLabels({
+          uri: record.uri,
+          cid: record.cid,
+          record: record.value,
+        })
 
-    const status = subjectStatusesResult.get(subject.uri)
+        const status = subjectStatusesResult.get(uri)
+        const blobs = await this.blob(findBlobRefs(record.value))
 
-    const [blobs, labels, externalLabels, subjectStatus] = await Promise.all([
-      this.blob(findBlobRefs(record.value)),
-      this.labels(record.uri),
-      this.getExternalLabels([record.uri], labelers),
-      status ? this.formatSubjectStatus(status) : Promise.resolve(undefined),
-    ])
-    const selfLabels = getSelfLabels({
-      uri: record.uri,
-      cid: record.cid,
-      record: record.value,
-    })
+        results.set(uri, {
+          ...record,
+          blobs,
+          moderation: {
+            ...record.moderation,
+            subjectStatus: status
+              ? this.formatSubjectStatus(status)
+              : undefined,
+          },
+          labels: [
+            ...(localLabels.get(uri) || []),
+            ...selfLabels,
+            ...(externalLabels.get(uri) || []),
+          ],
+        })
+      }),
+    )
 
-    return {
-      ...record,
-      blobs,
-      moderation: {
-        ...record.moderation,
-        subjectStatus,
-      },
-      labels: [...labels, ...selfLabels, ...externalLabels],
-    }
+    return results
   }
 
   async getExternalLabels(
     subjects: string[],
     labelers?: ParsedLabelers,
-  ): Promise<Label[]> {
-    if (!labelers?.dids.length && !labelers?.redact.size) return []
+  ): Promise<Map<string, Label[]>> {
+    const results = new Map<string, Label[]>()
+    if (!labelers?.dids.length && !labelers?.redact.size) return results
     try {
       const {
         data: { labels },
@@ -356,13 +376,20 @@ export class ModerationViews {
         uriPatterns: subjects,
         sources: labelers.dids,
       })
-      return labels
+      labels.forEach((label) => {
+        if (!results.has(label.uri)) {
+          results.set(label.uri, [label])
+          return
+        }
+        results.get(label.uri)?.push(label)
+      })
+      return results
     } catch (err) {
       httpLogger.error(
         { err, subjects, labelers },
         'failed to resolve labels from appview',
       )
-      return []
+      return results
     }
   }
 
@@ -452,14 +479,28 @@ export class ModerationViews {
     })
   }
 
-  async labels(subject: string, includeNeg?: boolean): Promise<Label[]> {
+  async labels(
+    subjects: string[],
+    includeNeg?: boolean,
+  ): Promise<Map<string, Label[]>> {
+    const labels = new Map<string, Label[]>()
     const res = await this.db.db
       .selectFrom('label')
-      .where('label.uri', '=', subject)
+      .where('label.uri', 'in', subjects)
       .if(!includeNeg, (qb) => qb.where('neg', '=', false))
       .selectAll()
       .execute()
-    return Promise.all(res.map((l) => this.formatLabelAndEnsureSig(l)))
+
+    await Promise.all(
+      res.map(async (labelRow) => {
+        const signedLabel = await this.formatLabelAndEnsureSig(labelRow)
+        if (!labels.has(labelRow.uri)) {
+          labels.set(labelRow.uri, [])
+        }
+        labels.get(labelRow.uri)?.push(signedLabel)
+      }),
+    )
+    return labels
   }
 
   async formatLabelAndEnsureSig(row: LabelRow) {

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

@@ -0,0 +1,153 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`admin get records view get multiple records by uris 1`] = `
+Object {
+  "records": Array [
+    Object {
+      "$type": "tools.ozone.moderation.defs#recordViewDetail",
+      "blobCids": Array [],
+      "blobs": Array [],
+      "cid": "cids(0)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(0)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "sig": Object {
+            "$bytes": "sig(0)",
+          },
+          "src": "user(2)",
+          "uri": "record(0)",
+          "val": "!takedown",
+          "ver": 1,
+        },
+        Object {
+          "cid": "cids(0)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(0)",
+          "val": "self-label",
+        },
+      ],
+      "moderation": Object {
+        "subjectStatus": Object {
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "id": 1,
+          "lastReportedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedBy": "user(1)",
+          "reviewState": "tools.ozone.moderation.defs#reviewClosed",
+          "subject": Object {
+            "$type": "com.atproto.repo.strongRef",
+            "cid": "cids(0)",
+            "uri": "record(0)",
+          },
+          "subjectBlobCids": Array [],
+          "subjectRepoHandle": "alice.test",
+          "tags": Array [
+            "lang:en",
+          ],
+          "takendown": true,
+          "updatedAt": "1970-01-01T00:00:00.000Z",
+        },
+      },
+      "repo": Object {
+        "did": "user(0)",
+        "email": "alice@test.com",
+        "handle": "alice.test",
+        "indexedAt": "1970-01-01T00:00:00.000Z",
+        "invitesDisabled": false,
+        "moderation": Object {},
+        "relatedRecords": Array [
+          Object {
+            "$type": "app.bsky.actor.profile",
+            "avatar": Object {
+              "$type": "blob",
+              "mimeType": "image/jpeg",
+              "ref": Object {
+                "$link": "cids(1)",
+              },
+              "size": 3976,
+            },
+            "createdAt": "1970-01-01T00:00:00.000Z",
+            "description": "its me!",
+            "displayName": "ali",
+            "labels": Object {
+              "$type": "com.atproto.label.defs#selfLabels",
+              "values": Array [
+                Object {
+                  "val": "self-label-a",
+                },
+                Object {
+                  "val": "self-label-b",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      "uri": "record(0)",
+      "value": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "labels": Object {
+          "$type": "com.atproto.label.defs#selfLabels",
+          "values": Array [
+            Object {
+              "val": "self-label",
+            },
+          ],
+        },
+        "text": "hey there",
+      },
+    },
+    Object {
+      "$type": "tools.ozone.moderation.defs#recordViewDetail",
+      "blobCids": Array [],
+      "blobs": Array [],
+      "cid": "cids(2)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [],
+      "moderation": Object {},
+      "repo": Object {
+        "did": "user(3)",
+        "email": "bob@test.com",
+        "handle": "bob.test",
+        "indexedAt": "1970-01-01T00:00:00.000Z",
+        "invitesDisabled": false,
+        "moderation": Object {},
+        "relatedRecords": Array [
+          Object {
+            "$type": "app.bsky.actor.profile",
+            "avatar": Object {
+              "$type": "blob",
+              "mimeType": "image/jpeg",
+              "ref": Object {
+                "$link": "cids(1)",
+              },
+              "size": 3976,
+            },
+            "createdAt": "1970-01-01T00:00:00.000Z",
+            "description": "hi im bob label_me",
+            "displayName": "bobby",
+          },
+        ],
+      },
+      "uri": "record(1)",
+      "value": Object {
+        "$type": "app.bsky.feed.post",
+        "createdAt": "1970-01-01T00:00:00.000Z",
+        "langs": Array [
+          "en-US",
+          "i-klingon",
+        ],
+        "text": "bob back at it again!",
+      },
+    },
+    Object {
+      "$type": "tools.ozone.moderation.defs#recordViewNotFound",
+      "uri": "record(2)",
+    },
+  ],
+}
+`;

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

@@ -0,0 +1,108 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`admin get multiple repos gets multiple repos by did 1`] = `
+Object {
+  "repos": Array [
+    Object {
+      "$type": "tools.ozone.moderation.defs#repoViewDetail",
+      "did": "user(0)",
+      "email": "alice@test.com",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "invites": Array [],
+      "invitesDisabled": false,
+      "labels": Array [
+        Object {
+          "cts": "1970-01-01T00:00:00.000Z",
+          "sig": Object {
+            "$bytes": "sig(0)",
+          },
+          "src": "user(2)",
+          "uri": "user(0)",
+          "val": "!takedown",
+          "ver": 1,
+        },
+      ],
+      "moderation": Object {
+        "subjectStatus": Object {
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "id": 1,
+          "lastReportedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedBy": "user(1)",
+          "reviewState": "tools.ozone.moderation.defs#reviewClosed",
+          "subject": Object {
+            "$type": "com.atproto.admin.defs#repoRef",
+            "did": "user(0)",
+          },
+          "subjectBlobCids": Array [],
+          "subjectRepoHandle": "alice.test",
+          "tags": Array [
+            "lang:und",
+          ],
+          "takendown": true,
+          "updatedAt": "1970-01-01T00:00:00.000Z",
+        },
+      },
+      "relatedRecords": Array [
+        Object {
+          "$type": "app.bsky.actor.profile",
+          "avatar": Object {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": Object {
+              "$link": "cids(0)",
+            },
+            "size": 3976,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "description": "its me!",
+          "displayName": "ali",
+          "labels": Object {
+            "$type": "com.atproto.label.defs#selfLabels",
+            "values": Array [
+              Object {
+                "val": "self-label-a",
+              },
+              Object {
+                "val": "self-label-b",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    Object {
+      "$type": "tools.ozone.moderation.defs#repoViewDetail",
+      "did": "user(3)",
+      "email": "bob@test.com",
+      "handle": "bob.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "invites": Array [],
+      "invitesDisabled": false,
+      "labels": Array [],
+      "moderation": Object {},
+      "relatedRecords": Array [
+        Object {
+          "$type": "app.bsky.actor.profile",
+          "avatar": Object {
+            "$type": "blob",
+            "mimeType": "image/jpeg",
+            "ref": Object {
+              "$link": "cids(0)",
+            },
+            "size": 3976,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "description": "hi im bob label_me",
+          "displayName": "bobby",
+        },
+      ],
+    },
+    Object {
+      "$type": "tools.ozone.moderation.defs#repoViewNotFound",
+      "did": "did:web:xyz",
+    },
+  ],
+}
+`;

package/tests/get-records.test.ts

@@ -0,0 +1,87 @@
+import {
+  SeedClient,
+  TestNetwork,
+  basicSeed,
+  TestOzone,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import { AtpAgent } from '@atproto/api'
+import {
+  REASONOTHER,
+  REASONSPAM,
+} from '../src/lexicon/types/com/atproto/moderation/defs'
+import { forSnapshot } from './_util'
+import { ids } from '../src/lexicon/lexicons'
+
+describe('admin get records view', () => {
+  let network: TestNetwork
+  let ozone: TestOzone
+  let agent: AtpAgent
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_admin_get_records',
+    })
+    ozone = network.ozone
+    agent = ozone.getClient()
+    sc = network.getSeedClient()
+    modClient = ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  beforeAll(async () => {
+    await sc.createReport({
+      reportedBy: sc.dids.bob,
+      reasonType: REASONSPAM,
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: REASONOTHER,
+      reason: 'defamation',
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventTakedown' },
+      subject: {
+        $type: 'com.atproto.repo.strongRef',
+        uri: sc.posts[sc.dids.alice][0].ref.uriStr,
+        cid: sc.posts[sc.dids.alice][0].ref.cidStr,
+      },
+    })
+    await network.bsky.ctx.dataplane.takedownRecord({
+      recordUri: sc.posts[sc.dids.alice][0].ref.uriStr,
+    })
+  })
+
+  it('get multiple records by uris', async () => {
+    const { data } = await agent.tools.ozone.moderation.getRecords(
+      {
+        uris: [
+          sc.posts[sc.dids.alice][0].ref.uriStr,
+          sc.posts[sc.dids.bob][0].ref.uriStr,
+          //     create a uri for a non-existent collection
+          sc.posts[sc.dids.bob][0].ref.uriStr.replace('.post', '.test'),
+        ],
+      },
+      { headers: await ozone.modHeaders(ids.ToolsOzoneModerationGetRecords) },
+    )
+
+    expect(forSnapshot(data)).toMatchSnapshot()
+  })
+})

package/tests/get-repos.test.ts

@@ -0,0 +1,87 @@
+import {
+  SeedClient,
+  TestNetwork,
+  TestOzone,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import { AtpAgent } from '@atproto/api'
+import {
+  REASONOTHER,
+  REASONSPAM,
+} from '../src/lexicon/types/com/atproto/moderation/defs'
+import { forSnapshot } from './_util'
+import { ids } from '../src/lexicon/lexicons'
+
+describe('admin get multiple repos', () => {
+  let network: TestNetwork
+  let ozone: TestOzone
+  let agent: AtpAgent
+  let pdsAgent: AtpAgent
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_admin_get_repos',
+    })
+    ozone = network.ozone
+    agent = ozone.getClient()
+    pdsAgent = network.pds.getClient()
+    sc = network.getSeedClient()
+    modClient = ozone.getModClient()
+    await basicSeed(sc)
+    await pdsAgent.com.atproto.server.deactivateAccount(
+      {},
+      { encoding: 'application/json', headers: sc.getHeaders(sc.dids.dan) },
+    )
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  beforeAll(async () => {
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventAcknowledge' },
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.bob,
+      reasonType: REASONSPAM,
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await sc.createReport({
+      reportedBy: sc.dids.carol,
+      reasonType: REASONOTHER,
+      reason: 'defamation',
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventTakedown' },
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: sc.dids.alice,
+      },
+    })
+  })
+
+  it('gets multiple repos by did', async () => {
+    const { data } = await agent.tools.ozone.moderation.getRepos(
+      { dids: [sc.dids.alice, sc.dids.bob, 'did:web:xyz'] },
+      { headers: await ozone.modHeaders(ids.ToolsOzoneModerationGetRepos) },
+    )
+
+    expect(forSnapshot(data)).toMatchSnapshot()
+  })
+})