@atproto/ozone 0.1.91 → 0.1.93

package/src/api/moderation/getSubjects.ts

@@ -0,0 +1,101 @@
+import { ToolsOzoneModerationDefs } from '@atproto/api'
+import { AtUri } from '@atproto/syntax'
+import { AppContext } from '../../context'
+import { Server } from '../../lexicon'
+import { SubjectView } from '../../lexicon/types/tools/ozone/moderation/defs'
+import { addAccountInfoToRepoViewDetail, getPdsAccountInfos } from '../util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.tools.ozone.moderation.getSubjects({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params, auth, req }) => {
+      const { subjects } = params
+      const db = ctx.db
+      const labelers = ctx.reqLabelers(req)
+      const uris = new Set<string>()
+      const dids = new Set<string>()
+
+      for (const subject of subjects) {
+        if (subject.startsWith('did:')) {
+          dids.add(subject)
+        }
+        if (subject.startsWith('at://')) {
+          uris.add(subject)
+          dids.add(new AtUri(subject).host)
+        }
+      }
+
+      const didsArray = Array.from(dids)
+      const modViews = ctx.modService(db).views
+      const [partialRepos, accountInfo, recordInfo, profiles] =
+        await Promise.all([
+          modViews.repoDetails(didsArray, labelers),
+          getPdsAccountInfos(ctx, didsArray),
+          modViews.recordDetails(
+            Array.from(uris).map((uri) => ({ uri })),
+            labelers,
+          ),
+          modViews.getProfiles(didsArray),
+        ])
+
+      const missingSubjects: string[] = []
+      const subjectWithDetails = new Map<string, SubjectView>()
+
+      for (const subject of subjects) {
+        const type = subject.startsWith('did:') ? 'account' : 'record'
+        const did = type === 'account' ? subject : new AtUri(subject).host
+        const partialRepo = partialRepos.get(did)
+        const repo = partialRepo
+          ? addAccountInfoToRepoViewDetail(
+              partialRepo,
+              accountInfo.get(did) || null,
+              auth.credentials.isModerator,
+            )
+          : undefined
+        const profile = profiles.get(did)
+        const record = type === 'record' ? recordInfo.get(subject) : undefined
+        const status =
+          type === 'record'
+            ? record?.moderation.subjectStatus
+            : repo?.moderation.subjectStatus
+
+        subjectWithDetails.set(subject, {
+          type,
+          repo,
+          record,
+          profile: profile && {
+            $type: 'app.bsky.actor.defs#profileViewDetailed',
+            ...profile,
+          },
+          status,
+          subject,
+        })
+
+        if ((type === 'record' && !record) || (type === 'account' && !repo)) {
+          missingSubjects.push(subject)
+        }
+      }
+
+      // When a subject is repo or record but the repo/record was deleted, we still want to attach moderation status if any exists
+      const missingSubjectStatuses =
+        await modViews.getSubjectStatus(missingSubjects)
+
+      for (const [subject, status] of missingSubjectStatuses) {
+        const subjectView = subjectWithDetails.get(subject)
+        if (subjectView)
+          subjectView.status = modViews.formatSubjectStatus(status)
+      }
+
+      const allSubjects: ToolsOzoneModerationDefs.SubjectView[] = []
+      for (const subject of subjects) {
+        const subjectView = subjectWithDetails.get(subject)
+        if (subjectView) allSubjects.push(subjectView)
+      }
+
+      return {
+        encoding: 'application/json',
+        body: { subjects: allSubjects },
+      }
+    },
+  })
+}

package/src/api/util.ts

@@ -36,7 +36,7 @@ export const getPdsAccountInfos = async (
   const results = new Map<string, AccountView | null>()
 
   const agent = ctx.pdsAgent
-  if (!agent) return results
+  if (!agent || !dids.length) return results
 
   const auth = await ctx.pdsAuth(ids.ComAtprotoAdminGetAccountInfos)
   if (!auth) return results

package/src/lexicon/index.ts

@@ -184,6 +184,7 @@ import * as ToolsOzoneModerationGetRecords from './types/tools/ozone/moderation/
 import * as ToolsOzoneModerationGetRepo from './types/tools/ozone/moderation/getRepo.js'
 import * as ToolsOzoneModerationGetReporterStats from './types/tools/ozone/moderation/getReporterStats.js'
 import * as ToolsOzoneModerationGetRepos from './types/tools/ozone/moderation/getRepos.js'
+import * as ToolsOzoneModerationGetSubjects from './types/tools/ozone/moderation/getSubjects.js'
 import * as ToolsOzoneModerationQueryEvents from './types/tools/ozone/moderation/queryEvents.js'
 import * as ToolsOzoneModerationQueryStatuses from './types/tools/ozone/moderation/queryStatuses.js'
 import * as ToolsOzoneModerationSearchRepos from './types/tools/ozone/moderation/searchRepos.js'
@@ -2507,6 +2508,17 @@ export class ToolsOzoneModerationNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getSubjects<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ToolsOzoneModerationGetSubjects.Handler<ExtractAuth<AV>>,
+      ToolsOzoneModerationGetSubjects.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'tools.ozone.moderation.getSubjects' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   queryEvents<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,

package/src/lexicon/lexicons.ts

@@ -10593,6 +10593,8 @@ export const schemaDict = {
           },
           reactions: {
             type: 'array',
+            description:
+              'Reactions to this message, in ascending order of creation time.',
             items: {
               type: 'ref',
               ref: 'lex:chat.bsky.convo.defs#reactionView',
@@ -10640,7 +10642,7 @@ export const schemaDict = {
       },
       reactionView: {
         type: 'object',
-        required: ['value', 'sender', 'createdAt'],
+        required: ['value', 'sender'],
         properties: {
           value: {
             type: 'string',
@@ -10649,10 +10651,6 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:chat.bsky.convo.defs#reactionViewSender',
           },
-          createdAt: {
-            type: 'string',
-            format: 'datetime',
-          },
         },
       },
       reactionViewSender: {
@@ -12103,6 +12101,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 +13294,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 +15018,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/chat/bsky/convo/defs.ts

@@ -60,6 +60,7 @@ export interface MessageView {
   /** Annotations of text (mentions, URLs, hashtags, etc) */
   facets?: AppBskyRichtextFacet.Main[]
   embed?: $Typed<AppBskyEmbedRecord.View> | { $type: string }
+  /** Reactions to this message, in ascending order of creation time. */
   reactions?: ReactionView[]
   sender: MessageViewSender
   sentAt: string
@@ -112,7 +113,6 @@ export interface ReactionView {
   $type?: 'chat.bsky.convo.defs#reactionView'
   value: string
   sender: ReactionViewSender
-  createdAt: string
 }
 
 const hashReactionView = 'reactionView'

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 }, auth)
+
+      data.profiles.forEach((profile) => {
+        profiles.set(profile.did, profile)
+      })
+    }
+
+    return profiles
+  }
 }
 
 type RecordSubject = { uri: string; cid?: string }