@atproto/ozone 0.1.14 → 0.1.15

package/src/api/chat/getMessageContext.ts

@@ -0,0 +1,39 @@
+import { Server } from '../../lexicon'
+import AppContext from '../../context'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+
+export default function (server: Server, ctx: AppContext) {
+  server.chat.bsky.moderation.getMessageContext({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params, auth }) => {
+      if (!ctx.chatAgent) {
+        throw new InvalidRequestError('No chat agent configured')
+      }
+      const maxWindowSize = auth.credentials.isModerator ? 5 : 0
+      const before = Math.min(maxWindowSize, params.before)
+      const after = Math.min(maxWindowSize, params.after)
+
+      // Ensure that the requested message was actually reported to prevent arbitrary lookups
+      const found = await ctx.db.db
+        .selectFrom('moderation_event')
+        .select('id')
+        .where('subjectMessageId', '=', params.messageId)
+        .where('action', '=', 'tools.ozone.moderation.defs#modEventReport')
+        .limit(1)
+        .executeTakeFirst()
+      if (!found) {
+        throw new InvalidRequestError('No report for requested message')
+      }
+
+      const res =
+        await ctx.chatAgent.api.chat.bsky.moderation.getMessageContext(
+          { ...params, before, after },
+          await ctx.chatAuth(),
+        )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+}

package/src/api/chat/index.ts

@@ -0,0 +1,10 @@
+import { Server } from '../../lexicon'
+import AppContext from '../../context'
+import getActorMetadata from './getActorMetadata'
+import getMessageContext from './getMessageContext'
+
+export default function (server: Server, ctx: AppContext) {
+  getActorMetadata(server, ctx)
+  getMessageContext(server, ctx)
+  return server
+}

package/src/api/index.ts

@@ -15,6 +15,7 @@ import createTemplate from './communication/createTemplate'
 import updateTemplate from './communication/updateTemplate'
 import deleteTemplate from './communication/deleteTemplate'
 import listTemplates from './communication/listTemplates'
+import chat from './chat'
 import proxied from './proxied'
 
 export * as health from './health'
@@ -37,6 +38,7 @@ export default function (server: Server, ctx: AppContext) {
   createTemplate(server, ctx)
   updateTemplate(server, ctx)
   deleteTemplate(server, ctx)
+  chat(server, ctx)
   proxied(server, ctx)
   return server
 }

package/src/api/moderation/emitEvent.ts

@@ -7,8 +7,10 @@ import {
   isModEventLabel,
   isModEventMuteReporter,
   isModEventReverseTakedown,
+  isModEventTag,
   isModEventTakedown,
   isModEventUnmuteReporter,
+  ModEventTag,
 } from '../../lexicon/types/tools/ozone/moderation/defs'
 import { HandlerInput } from '../../lexicon/types/tools/ozone/moderation/emitEvent'
 import { subjectFromInput } from '../../mod-service/subject'
@@ -122,6 +124,10 @@ const handleModerationEvent = async ({
     throw new InvalidRequestError('Subject must be a repo when muting reporter')
   }
 
+  if (isModEventTag(event)) {
+    assertTagAuth(event, auth)
+  }
+
   const moderationEvent = await db.transaction(async (dbTxn) => {
     const moderationTxn = ctx.modService(dbTxn)
 
@@ -214,6 +220,31 @@ export default function (server: Server, ctx: AppContext) {
   })
 }
 
+const TAG_AUTH: Record<string, 'triage' | 'moderator' | 'admin'> = {
+  'chat-disabled': 'moderator',
+}
+
+const assertTagAuth = (
+  event: ModEventTag,
+  auth: ModeratorOutput | AdminTokenOutput,
+) => {
+  // admins can add/remove any tag
+  if (auth.credentials.isAdmin) return
+
+  for (const tag of Object.keys(TAG_AUTH)) {
+    if (event.add.includes(tag) || event.remove.includes(tag)) {
+      if (TAG_AUTH[tag] === 'admin' && !auth.credentials.isAdmin) {
+        throw new Error(`Must be an admin to add tag: ${tag}`)
+      } else if (
+        TAG_AUTH[tag] === 'moderator' &&
+        !auth.credentials.isModerator
+      ) {
+        throw new Error(`Must be a full moderator to add tag: ${tag}`)
+      }
+    }
+  }
+}
+
 const validateLabels = (labels: string[]) => {
   for (const label of labels) {
     for (const char of badChars) {

package/src/api/util.ts

@@ -118,4 +118,5 @@ const eventTypes = new Set([
   'tools.ozone.moderation.defs#modEventEmail',
   'tools.ozone.moderation.defs#modEventResolveAppeal',
   'tools.ozone.moderation.defs#modEventTag',
+  'tools.ozone.moderation.defs#modEventDivert',
 ])

package/src/config/config.ts

@@ -41,6 +41,15 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
     }
   }
 
+  let chatCfg: OzoneConfig['chat'] = null
+  if (env.chatUrl || env.chatDid) {
+    assert(env.chatUrl && env.chatDid)
+    chatCfg = {
+      url: env.chatUrl,
+      did: env.chatDid,
+    }
+  }
+
   const cdnCfg: OzoneConfig['cdn'] = {
     paths: env.cdnPaths,
   }
@@ -68,6 +77,7 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
     db: dbCfg,
     appview: appviewCfg,
     pds: pdsCfg,
+    chat: chatCfg,
     cdn: cdnCfg,
     identity: identityCfg,
     blobDivert: blobDivertServiceCfg,
@@ -80,6 +90,7 @@ export type OzoneConfig = {
   db: DatabaseConfig
   appview: AppviewConfig
   pds: PdsConfig | null
+  chat: ChatConfig | null
   cdn: CdnConfig
   identity: IdentityConfig
   blobDivert: BlobDivertConfig | null
@@ -118,6 +129,11 @@ export type PdsConfig = {
   did: string
 }
 
+export type ChatConfig = {
+  url: string
+  did: string
+}
+
 export type CdnConfig = {
   paths?: string[]
 }

package/src/config/env.ts

@@ -13,6 +13,8 @@ export const readEnv = (): OzoneEnvironment => {
     appviewPushEvents: envBool('OZONE_APPVIEW_PUSH_EVENTS'),
     pdsUrl: envStr('OZONE_PDS_URL'),
     pdsDid: envStr('OZONE_PDS_DID'),
+    chatUrl: envStr('OZONE_CHAT_URL'),
+    chatDid: envStr('OZONE_CHAT_DID'),
     dbPostgresUrl: envStr('OZONE_DB_POSTGRES_URL'),
     dbPostgresSchema: envStr('OZONE_DB_POSTGRES_SCHEMA'),
     dbPoolSize: envInt('OZONE_DB_POOL_SIZE'),
@@ -42,6 +44,8 @@ export type OzoneEnvironment = {
   appviewPushEvents?: boolean
   pdsUrl?: string
   pdsDid?: string
+  chatUrl?: string
+  chatDid?: string
   dbPostgresUrl?: string
   dbPostgresSchema?: string
   dbPoolSize?: number

package/src/context.ts

@@ -26,6 +26,7 @@ export type AppContextOptions = {
   communicationTemplateService: CommunicationTemplateServiceCreator
   appviewAgent: AtpAgent
   pdsAgent: AtpAgent | undefined
+  chatAgent: AtpAgent | undefined
   blobDiverter?: BlobDiverter
   signingKey: Keypair
   signingKeyId: number
@@ -60,6 +61,9 @@ export class AppContext {
     const pdsAgent = cfg.pds
       ? new AtpAgent({ service: cfg.pds.url })
       : undefined
+    const chatAgent = cfg.chat
+      ? new AtpAgent({ service: cfg.chat.url })
+      : undefined
 
     const idResolver = new IdResolver({
       plcUrl: cfg.identity.plcUrl,
@@ -115,6 +119,7 @@ export class AppContext {
         communicationTemplateService,
         appviewAgent,
         pdsAgent,
+        chatAgent,
         signingKey,
         signingKeyId,
         idResolver,
@@ -164,6 +169,10 @@ export class AppContext {
     return this.opts.pdsAgent
   }
 
+  get chatAgent(): AtpAgent | undefined {
+    return this.opts.chatAgent
+  }
+
   get signingKey(): Keypair {
     return this.opts.signingKey
   }
@@ -212,6 +221,13 @@ export class AppContext {
     return this.serviceAuthHeaders(this.cfg.appview.did)
   }
 
+  async chatAuth() {
+    if (!this.cfg.chat) {
+      throw new Error('No chat service configured')
+    }
+    return this.serviceAuthHeaders(this.cfg.chat.did)
+  }
+
   devOverride(overrides: Partial<AppContextOptions>) {
     this.opts = {
       ...this.opts,

package/src/db/migrations/20240506T225055595Z-message-subject.ts

@@ -0,0 +1,21 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_event')
+    .addColumn('subjectMessageId', 'varchar')
+    .execute()
+  // support lookup for chat.bsky.moderation.getMessageContext
+  await db.schema
+    .createIndex('moderation_event_message_id_index')
+    .on('moderation_event')
+    .column('subjectMessageId')
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('moderation_event')
+    .dropColumn('subjectMessageId')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -8,3 +8,4 @@ export * as _20240201T051104136Z from './20240201T051104136Z-mod-event-blobs'
 export * as _20240208T213404429Z from './20240208T213404429Z-add-tags-column-to-moderation-subject'
 export * as _20240228T003647759Z from './20240228T003647759Z-add-label-sigs'
 export * as _20240408T192432676Z from './20240408T192432676Z-mute-reporting'
+export * as _20240506T225055595Z from './20240506T225055595Z-message-subject'

package/src/db/schema/moderation_event.ts

@@ -19,11 +19,15 @@ export interface ModerationEvent {
     | 'tools.ozone.moderation.defs#modEventEmail'
     | 'tools.ozone.moderation.defs#modEventResolveAppeal'
     | 'tools.ozone.moderation.defs#modEventTag'
-  subjectType: 'com.atproto.admin.defs#repoRef' | 'com.atproto.repo.strongRef'
+  subjectType:
+    | 'com.atproto.admin.defs#repoRef'
+    | 'com.atproto.repo.strongRef'
+    | 'chat.bsky.convo.defs#messageRef'
   subjectDid: string
   subjectUri: string | null
   subjectCid: string | null
   subjectBlobCids: string[] | null
+  subjectMessageId: string | null
   createLabelVals: string | null
   negateLabelVals: string | null
   comment: string | null

package/src/lexicon/index.ts

@@ -129,6 +129,23 @@ import * as AppBskyUnspeccedGetSuggestionsSkeleton from './types/app/bsky/unspec
 import * as AppBskyUnspeccedGetTaggedSuggestions from './types/app/bsky/unspecced/getTaggedSuggestions'
 import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton'
 import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton'
+import * as ChatBskyActorDeleteAccount from './types/chat/bsky/actor/deleteAccount'
+import * as ChatBskyActorExportAccountData from './types/chat/bsky/actor/exportAccountData'
+import * as ChatBskyConvoDeleteMessageForSelf from './types/chat/bsky/convo/deleteMessageForSelf'
+import * as ChatBskyConvoGetConvo from './types/chat/bsky/convo/getConvo'
+import * as ChatBskyConvoGetConvoForMembers from './types/chat/bsky/convo/getConvoForMembers'
+import * as ChatBskyConvoGetLog from './types/chat/bsky/convo/getLog'
+import * as ChatBskyConvoGetMessages from './types/chat/bsky/convo/getMessages'
+import * as ChatBskyConvoLeaveConvo from './types/chat/bsky/convo/leaveConvo'
+import * as ChatBskyConvoListConvos from './types/chat/bsky/convo/listConvos'
+import * as ChatBskyConvoMuteConvo from './types/chat/bsky/convo/muteConvo'
+import * as ChatBskyConvoSendMessage from './types/chat/bsky/convo/sendMessage'
+import * as ChatBskyConvoSendMessageBatch from './types/chat/bsky/convo/sendMessageBatch'
+import * as ChatBskyConvoUnmuteConvo from './types/chat/bsky/convo/unmuteConvo'
+import * as ChatBskyConvoUpdateRead from './types/chat/bsky/convo/updateRead'
+import * as ChatBskyModerationGetActorMetadata from './types/chat/bsky/moderation/getActorMetadata'
+import * as ChatBskyModerationGetMessageContext from './types/chat/bsky/moderation/getMessageContext'
+import * as ChatBskyModerationUpdateActorAccess from './types/chat/bsky/moderation/updateActorAccess'
 import * as ToolsOzoneCommunicationCreateTemplate from './types/tools/ozone/communication/createTemplate'
 import * as ToolsOzoneCommunicationDeleteTemplate from './types/tools/ozone/communication/deleteTemplate'
 import * as ToolsOzoneCommunicationListTemplates from './types/tools/ozone/communication/listTemplates'
@@ -183,12 +200,14 @@ export class Server {
   xrpc: XrpcServer
   com: ComNS
   app: AppNS
+  chat: ChatNS
   tools: ToolsNS
 
   constructor(options?: XrpcOptions) {
     this.xrpc = createXrpcServer(schemas, options)
     this.com = new ComNS(this)
     this.app = new AppNS(this)
+    this.chat = new ChatNS(this)
     this.tools = new ToolsNS(this)
   }
 }
@@ -1713,6 +1732,241 @@ export class AppBskyUnspeccedNS {
   }
 }
 
+export class ChatNS {
+  _server: Server
+  bsky: ChatBskyNS
+
+  constructor(server: Server) {
+    this._server = server
+    this.bsky = new ChatBskyNS(server)
+  }
+}
+
+export class ChatBskyNS {
+  _server: Server
+  actor: ChatBskyActorNS
+  convo: ChatBskyConvoNS
+  moderation: ChatBskyModerationNS
+
+  constructor(server: Server) {
+    this._server = server
+    this.actor = new ChatBskyActorNS(server)
+    this.convo = new ChatBskyConvoNS(server)
+    this.moderation = new ChatBskyModerationNS(server)
+  }
+}
+
+export class ChatBskyActorNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  deleteAccount<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyActorDeleteAccount.Handler<ExtractAuth<AV>>,
+      ChatBskyActorDeleteAccount.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.actor.deleteAccount' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  exportAccountData<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyActorExportAccountData.Handler<ExtractAuth<AV>>,
+      ChatBskyActorExportAccountData.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.actor.exportAccountData' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
+export class ChatBskyConvoNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  deleteMessageForSelf<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoDeleteMessageForSelf.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoDeleteMessageForSelf.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.deleteMessageForSelf' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getConvoForMembers<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetConvoForMembers.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetConvoForMembers.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getConvoForMembers' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getLog<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetLog.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetLog.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getLog' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getMessages<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoGetMessages.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoGetMessages.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.getMessages' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  leaveConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoLeaveConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoLeaveConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.leaveConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  listConvos<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoListConvos.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoListConvos.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.listConvos' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  muteConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoMuteConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoMuteConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.muteConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  sendMessage<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoSendMessage.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoSendMessage.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.sendMessage' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  sendMessageBatch<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoSendMessageBatch.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoSendMessageBatch.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.sendMessageBatch' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  unmuteConvo<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoUnmuteConvo.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoUnmuteConvo.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.unmuteConvo' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  updateRead<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyConvoUpdateRead.Handler<ExtractAuth<AV>>,
+      ChatBskyConvoUpdateRead.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.convo.updateRead' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
+export class ChatBskyModerationNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  getActorMetadata<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyModerationGetActorMetadata.Handler<ExtractAuth<AV>>,
+      ChatBskyModerationGetActorMetadata.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.moderation.getActorMetadata' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getMessageContext<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyModerationGetMessageContext.Handler<ExtractAuth<AV>>,
+      ChatBskyModerationGetMessageContext.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.moderation.getMessageContext' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  updateActorAccess<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ChatBskyModerationUpdateActorAccess.Handler<ExtractAuth<AV>>,
+      ChatBskyModerationUpdateActorAccess.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'chat.bsky.moderation.updateActorAccess' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class ToolsNS {
   _server: Server
   ozone: ToolsOzoneNS