@atproto/ozone 0.1.91 → 0.1.92

package/src/lexicon/lexicons.ts

@@ -12103,6 +12103,37 @@ export const schemaDict = {
           },
         },
       },
+      subjectView: {
+        description:
+          "Detailed view of a subject. For record subjects, the author's repo and profile will be returned.",
+        type: 'object',
+        required: ['type', 'subject'],
+        properties: {
+          type: {
+            type: 'ref',
+            ref: 'lex:com.atproto.moderation.defs#subjectType',
+          },
+          subject: {
+            type: 'string',
+          },
+          status: {
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#subjectStatusView',
+          },
+          repo: {
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#repoViewDetail',
+          },
+          profile: {
+            type: 'union',
+            refs: [],
+          },
+          record: {
+            type: 'ref',
+            ref: 'lex:tools.ozone.moderation.defs#recordViewDetail',
+          },
+        },
+      },
       accountStats: {
         description: 'Statistics about a particular account subject',
         type: 'object',
@@ -13265,6 +13296,46 @@ export const schemaDict = {
       },
     },
   },
+  ToolsOzoneModerationGetSubjects: {
+    lexicon: 1,
+    id: 'tools.ozone.moderation.getSubjects',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get details about subjects.',
+        parameters: {
+          type: 'params',
+          required: ['subjects'],
+          properties: {
+            subjects: {
+              type: 'array',
+              maxLength: 100,
+              minLength: 1,
+              items: {
+                type: 'string',
+              },
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['subjects'],
+            properties: {
+              subjects: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:tools.ozone.moderation.defs#subjectView',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   ToolsOzoneModerationQueryEvents: {
     lexicon: 1,
     id: 'tools.ozone.moderation.queryEvents',
@@ -14949,6 +15020,7 @@ export const ids = {
   ToolsOzoneModerationGetReporterStats:
     'tools.ozone.moderation.getReporterStats',
   ToolsOzoneModerationGetRepos: 'tools.ozone.moderation.getRepos',
+  ToolsOzoneModerationGetSubjects: 'tools.ozone.moderation.getSubjects',
   ToolsOzoneModerationQueryEvents: 'tools.ozone.moderation.queryEvents',
   ToolsOzoneModerationQueryStatuses: 'tools.ozone.moderation.queryStatuses',
   ToolsOzoneModerationSearchRepos: 'tools.ozone.moderation.searchRepos',

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -156,6 +156,27 @@ export function validateSubjectStatusView<V>(v: V) {
   return validate<SubjectStatusView & V>(v, id, hashSubjectStatusView)
 }
 
+/** Detailed view of a subject. For record subjects, the author's repo and profile will be returned. */
+export interface SubjectView {
+  $type?: 'tools.ozone.moderation.defs#subjectView'
+  type: ComAtprotoModerationDefs.SubjectType
+  subject: string
+  status?: SubjectStatusView
+  repo?: RepoViewDetail
+  profile?: { $type: string }
+  record?: RecordViewDetail
+}
+
+const hashSubjectView = 'subjectView'
+
+export function isSubjectView<V>(v: V) {
+  return is$typed(v, id, hashSubjectView)
+}
+
+export function validateSubjectView<V>(v: V) {
+  return validate<SubjectView & V>(v, id, hashSubjectView)
+}
+
 /** Statistics about a particular account subject */
 export interface AccountStats {
   $type?: 'tools.ozone.moderation.defs#accountStats'

package/src/lexicon/types/tools/ozone/moderation/getSubjects.ts

@@ -0,0 +1,54 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ToolsOzoneModerationDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.moderation.getSubjects'
+
+export interface QueryParams {
+  subjects: string[]
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  subjects: ToolsOzoneModerationDefs.SubjectView[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/mod-service/views.ts

@@ -1,6 +1,6 @@
 import { sql } from 'kysely'
-import { AtpAgent } from '@atproto/api'
-import { dedupeStrs } from '@atproto/common'
+import { AppBskyActorDefs, AtpAgent } from '@atproto/api'
+import { chunkArray, dedupeStrs } from '@atproto/common'
 import { Keypair } from '@atproto/crypto'
 import { BlobRef } from '@atproto/lexicon'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
@@ -79,7 +79,7 @@ export class ModerationViews {
     const auth = await this.appviewAuth(ids.ComAtprotoAdminGetAccountInfos)
     if (!auth) return new Map()
     try {
-      const res = await this.appviewAgent.api.com.atproto.admin.getAccountInfos(
+      const res = await this.appviewAgent.com.atproto.admin.getAccountInfos(
         {
           dids: dedupeStrs(dids),
         },
@@ -266,6 +266,10 @@ export class ModerationViews {
     labelers?: ParsedLabelers,
   ): Promise<Map<string, RepoView>> {
     const results = new Map<string, RepoView>()
+    if (!dids.length) {
+      return results
+    }
+
     const [repos, localLabels, externalLabels] = await Promise.all([
       this.repos(dids),
       this.labels(dids),
@@ -373,6 +377,11 @@ export class ModerationViews {
     subjects: RecordSubject[],
     labelers?: ParsedLabelers,
   ): Promise<Map<string, RecordViewDetail>> {
+    const results = new Map<string, RecordViewDetail>()
+    if (!subjects.length) {
+      return results
+    }
+
     const subjectUris = subjects.map((s) => s.uri)
     const [records, subjectStatusesResult, localLabels, externalLabels] =
       await Promise.all([
@@ -382,8 +391,6 @@ export class ModerationViews {
         this.getExternalLabels(subjectUris, labelers),
       ])
 
-    const results = new Map<string, RecordViewDetail>()
-
     await Promise.all(
       Array.from(records.entries()).map(async ([uri, record]) => {
         const selfLabels = getSelfLabels({
@@ -425,7 +432,7 @@ export class ModerationViews {
     try {
       const {
         data: { labels },
-      } = await this.appviewAgent.api.com.atproto.label.queryLabels({
+      } = await this.appviewAgent.com.atproto.label.queryLabels({
         uriPatterns: subjects,
         sources: labelers.dids,
       })
@@ -695,10 +702,27 @@ export class ModerationViews {
     if (!auth) return []
     const {
       data: { feed },
-    } = await this.appviewAgent.api.app.bsky.feed.getAuthorFeed({ actor }, auth)
+    } = await this.appviewAgent.app.bsky.feed.getAuthorFeed({ actor }, auth)
 
     return feed
   }
+
+  async getProfiles(dids: string[]) {
+    const profiles = new Map<string, AppBskyActorDefs.ProfileViewDetailed>()
+
+    const auth = await this.appviewAuth(ids.AppBskyActorGetProfiles)
+    if (!auth) return profiles
+
+    for (const actors of chunkArray(dids, 25)) {
+      const { data } = await this.appviewAgent.getProfiles({ actors })
+
+      data.profiles.forEach((profile) => {
+        profiles.set(profile.did, profile)
+      })
+    }
+
+    return profiles
+  }
 }
 
 type RecordSubject = { uri: string; cid?: string }

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

@@ -0,0 +1,439 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`admin get multiple subjects with all relevant details gets multiple subjects with records 1`] = `
+Array [
+  Object {
+    "repo": Object {
+      "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 {
+          "accountStats": Object {
+            "$type": "tools.ozone.moderation.defs#accountStats",
+            "appealCount": 0,
+            "escalateCount": 0,
+            "reportCount": 1,
+            "suspendCount": 0,
+            "takedownCount": 1,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "hosting": Object {
+            "$type": "tools.ozone.moderation.defs#accountHosting",
+            "status": "unknown",
+          },
+          "id": 3,
+          "lastReportedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedBy": "user(1)",
+          "priorityScore": 0,
+          "recordsStats": Object {
+            "$type": "tools.ozone.moderation.defs#recordsStats",
+            "appealedCount": 0,
+            "escalatedCount": 0,
+            "pendingCount": 1,
+            "processedCount": 0,
+            "reportedCount": 1,
+            "subjectCount": 1,
+            "takendownCount": 0,
+            "totalReports": 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 [
+            "report:other",
+            "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",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    "status": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+        "appealCount": 0,
+        "escalateCount": 0,
+        "reportCount": 1,
+        "suspendCount": 0,
+        "takedownCount": 1,
+      },
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "hosting": Object {
+        "$type": "tools.ozone.moderation.defs#accountHosting",
+        "status": "unknown",
+      },
+      "id": 3,
+      "lastReportedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+      "lastReviewedBy": "user(1)",
+      "priorityScore": 0,
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordsStats",
+        "appealedCount": 0,
+        "escalatedCount": 0,
+        "pendingCount": 1,
+        "processedCount": 0,
+        "reportedCount": 1,
+        "subjectCount": 1,
+        "takendownCount": 0,
+        "totalReports": 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 [
+        "report:other",
+        "lang:und",
+      ],
+      "takendown": true,
+      "updatedAt": "1970-01-01T00:00:00.000Z",
+    },
+    "subject": "user(0)",
+    "type": "account",
+  },
+  Object {
+    "record": Object {
+      "blobCids": Array [],
+      "blobs": Array [],
+      "cid": "cids(1)",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(1)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(0)",
+          "val": "self-label",
+        },
+      ],
+      "moderation": Object {
+        "subjectStatus": Object {
+          "accountStats": Object {
+            "$type": "tools.ozone.moderation.defs#accountStats",
+            "appealCount": 0,
+            "escalateCount": 0,
+            "reportCount": 1,
+            "suspendCount": 0,
+            "takedownCount": 1,
+          },
+          "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",
+          "priorityScore": 0,
+          "recordsStats": Object {
+            "$type": "tools.ozone.moderation.defs#recordsStats",
+            "appealedCount": 0,
+            "escalatedCount": 0,
+            "pendingCount": 1,
+            "processedCount": 0,
+            "reportedCount": 1,
+            "subjectCount": 1,
+            "takendownCount": 0,
+            "totalReports": 1,
+          },
+          "reviewState": "tools.ozone.moderation.defs#reviewOpen",
+          "subject": Object {
+            "$type": "com.atproto.repo.strongRef",
+            "cid": "cids(1)",
+            "uri": "record(0)",
+          },
+          "subjectBlobCids": Array [],
+          "subjectRepoHandle": "alice.test",
+          "tags": Array [
+            "report:spam",
+            "lang:en",
+          ],
+          "takendown": false,
+          "updatedAt": "1970-01-01T00:00:00.000Z",
+        },
+      },
+      "repo": Object {
+        "did": "user(0)",
+        "handle": "alice.test",
+        "indexedAt": "1970-01-01T00:00:00.000Z",
+        "moderation": Object {
+          "subjectStatus": Object {
+            "accountStats": Object {
+              "$type": "tools.ozone.moderation.defs#accountStats",
+              "appealCount": 0,
+              "escalateCount": 0,
+              "reportCount": 1,
+              "suspendCount": 0,
+              "takedownCount": 1,
+            },
+            "createdAt": "1970-01-01T00:00:00.000Z",
+            "hosting": Object {
+              "$type": "tools.ozone.moderation.defs#accountHosting",
+              "status": "unknown",
+            },
+            "id": 3,
+            "lastReportedAt": "1970-01-01T00:00:00.000Z",
+            "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+            "lastReviewedBy": "user(1)",
+            "priorityScore": 0,
+            "recordsStats": Object {
+              "$type": "tools.ozone.moderation.defs#recordsStats",
+              "appealedCount": 0,
+              "escalatedCount": 0,
+              "pendingCount": 1,
+              "processedCount": 0,
+              "reportedCount": 1,
+              "subjectCount": 1,
+              "takendownCount": 0,
+              "totalReports": 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 [
+              "report:other",
+              "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",
+                },
+              ],
+            },
+          },
+        ],
+      },
+      "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",
+      },
+    },
+    "repo": Object {
+      "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 {
+          "accountStats": Object {
+            "$type": "tools.ozone.moderation.defs#accountStats",
+            "appealCount": 0,
+            "escalateCount": 0,
+            "reportCount": 1,
+            "suspendCount": 0,
+            "takedownCount": 1,
+          },
+          "createdAt": "1970-01-01T00:00:00.000Z",
+          "hosting": Object {
+            "$type": "tools.ozone.moderation.defs#accountHosting",
+            "status": "unknown",
+          },
+          "id": 3,
+          "lastReportedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedAt": "1970-01-01T00:00:00.000Z",
+          "lastReviewedBy": "user(1)",
+          "priorityScore": 0,
+          "recordsStats": Object {
+            "$type": "tools.ozone.moderation.defs#recordsStats",
+            "appealedCount": 0,
+            "escalatedCount": 0,
+            "pendingCount": 1,
+            "processedCount": 0,
+            "reportedCount": 1,
+            "subjectCount": 1,
+            "takendownCount": 0,
+            "totalReports": 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 [
+            "report:other",
+            "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",
+              },
+            ],
+          },
+        },
+      ],
+    },
+    "status": Object {
+      "accountStats": Object {
+        "$type": "tools.ozone.moderation.defs#accountStats",
+        "appealCount": 0,
+        "escalateCount": 0,
+        "reportCount": 1,
+        "suspendCount": 0,
+        "takedownCount": 1,
+      },
+      "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",
+      "priorityScore": 0,
+      "recordsStats": Object {
+        "$type": "tools.ozone.moderation.defs#recordsStats",
+        "appealedCount": 0,
+        "escalatedCount": 0,
+        "pendingCount": 1,
+        "processedCount": 0,
+        "reportedCount": 1,
+        "subjectCount": 1,
+        "takendownCount": 0,
+        "totalReports": 1,
+      },
+      "reviewState": "tools.ozone.moderation.defs#reviewOpen",
+      "subject": Object {
+        "$type": "com.atproto.repo.strongRef",
+        "cid": "cids(1)",
+        "uri": "record(0)",
+      },
+      "subjectBlobCids": Array [],
+      "subjectRepoHandle": "alice.test",
+      "tags": Array [
+        "report:spam",
+        "lang:en",
+      ],
+      "takendown": false,
+      "updatedAt": "1970-01-01T00:00:00.000Z",
+    },
+    "subject": "record(0)",
+    "type": "record",
+  },
+]
+`;