@atproto/ozone 0.1.14 → 0.1.16

package/src/lexicon/types/chat/bsky/convo/listConvos.ts

@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  convos: ChatBskyConvoDefs.ConvoView[]
+  [k: string]: unknown
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/convo/muteConvo.ts

@@ -0,0 +1,50 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  convo: ChatBskyConvoDefs.ConvoView
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/convo/sendMessage.ts

@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+  message: ChatBskyConvoDefs.MessageInput
+  [k: string]: unknown
+}
+
+export type OutputSchema = ChatBskyConvoDefs.MessageView
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/convo/sendMessageBatch.ts

@@ -0,0 +1,68 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  items: BatchItem[]
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  items: ChatBskyConvoDefs.MessageView[]
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface BatchItem {
+  convoId: string
+  message: ChatBskyConvoDefs.MessageInput
+  [k: string]: unknown
+}
+
+export function isBatchItem(v: unknown): v is BatchItem {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'chat.bsky.convo.sendMessageBatch#batchItem'
+  )
+}
+
+export function validateBatchItem(v: unknown): ValidationResult {
+  return lexicons.validate('chat.bsky.convo.sendMessageBatch#batchItem', v)
+}

package/src/lexicon/types/chat/bsky/convo/unmuteConvo.ts

@@ -0,0 +1,50 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  convo: ChatBskyConvoDefs.ConvoView
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/convo/updateRead.ts

@@ -0,0 +1,51 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  convoId: string
+  messageId?: string
+  [k: string]: unknown
+}
+
+export interface OutputSchema {
+  convo: ChatBskyConvoDefs.ConvoView
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts

@@ -0,0 +1,67 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+export interface QueryParams {
+  actor: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  day: Metadata
+  month: Metadata
+  all: Metadata
+  [k: string]: unknown
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface Metadata {
+  messagesSent: number
+  messagesReceived: number
+  convos: number
+  convosStarted: number
+  [k: string]: unknown
+}
+
+export function isMetadata(v: unknown): v is Metadata {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'chat.bsky.moderation.getActorMetadata#metadata'
+  )
+}
+
+export function validateMetadata(v: unknown): ValidationResult {
+  return lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v)
+}

package/src/lexicon/types/chat/bsky/moderation/getMessageContext.ts

@@ -0,0 +1,54 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ChatBskyConvoDefs from '../convo/defs'
+
+export interface QueryParams {
+  /** Conversation that the message is from. NOTE: this field will eventually be required. */
+  convoId?: string
+  messageId: string
+  before: number
+  after: number
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  messages: (
+    | ChatBskyConvoDefs.MessageView
+    | ChatBskyConvoDefs.DeletedMessageView
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+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
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts

@@ -0,0 +1,40 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  actor: string
+  allowAccess: boolean
+  ref?: string
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | void
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

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

@@ -7,6 +7,7 @@ import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import * as ComAtprotoAdminDefs from '../../../com/atproto/admin/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as ChatBskyConvoDefs from '../../../chat/bsky/convo/defs'
 import * as ComAtprotoModerationDefs from '../../../com/atproto/moderation/defs'
 import * as ComAtprotoServerDefs from '../../../com/atproto/server/defs'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
@@ -32,6 +33,7 @@ export interface ModEventView {
   subject:
     | ComAtprotoAdminDefs.RepoRef
     | ComAtprotoRepoStrongRef.Main
+    | ChatBskyConvoDefs.MessageRef
     | { $type: string; [k: string]: unknown }
   subjectBlobCids: string[]
   createdBy: string

package/src/mod-service/index.ts

@@ -18,7 +18,6 @@ import {
   isModEventTakedown,
   isModEventEmail,
   isModEventTag,
-  isModEventUnmute,
 } from '../lexicon/types/tools/ozone/moderation/defs'
 import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
 import {
@@ -49,6 +48,7 @@ import { formatLabel, formatLabelRow, signLabel } from './util'
 import { ImageInvalidator } from '../image-invalidator'
 import { httpLogger as log } from '../logger'
 import { OzoneConfig } from '../config'
+import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
 
 export type ModerationServiceCreator = (db: Database) => ModerationService
 
@@ -97,7 +97,13 @@ export class ModerationService {
     this.signingKey,
     this.signingKeyId,
     this.appviewAgent,
-    () => this.createAuthHeaders(this.cfg.appview.did),
+    async (labelers?: ParsedLabelers) => {
+      const authHeaders = await this.createAuthHeaders(this.cfg.appview.did)
+      if (labelers?.dids?.length) {
+        authHeaders.headers[LABELER_HEADER_NAME] = labelers.dids.join(', ')
+      }
+      return authHeaders
+    },
   )
 
   async getEvent(id: number): Promise<ModerationEventRow | undefined> {
@@ -335,7 +341,7 @@ export class ModerationService {
         durationInHours: event.durationInHours
           ? Number(event.durationInHours)
           : null,
-        meta,
+        meta: Object.assign(meta, subjectInfo.meta),
         expiresAt:
           (isModEventTakedown(event) || isModEventMute(event)) &&
           event.durationInHours
@@ -346,6 +352,7 @@ export class ModerationService {
         subjectUri: subjectInfo.subjectUri,
         subjectCid: subjectInfo.subjectCid,
         subjectBlobCids: jsonb(subjectInfo.subjectBlobCids),
+        subjectMessageId: subjectInfo.subjectMessageId,
       })
       .returningAll()
       .executeTakeFirstOrThrow()

package/src/mod-service/subject.ts

@@ -5,6 +5,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'
 import { Main as StrongRef } from '../lexicon/types/com/atproto/repo/strongRef'
+import { MessageRef } from '../lexicon/types/chat/bsky/convo/defs'
 
 type SubjectInput = ReportInput['subject'] | ActionInput['subject']
 
@@ -28,6 +29,15 @@ export const subjectFromInput = (
   ) {
     return new RecordSubject(subject.uri, subject.cid, blobs)
   }
+  if (
+    subject.$type === 'chat.bsky.convo.defs#messageRef' &&
+    typeof subject.did === 'string' &&
+    typeof subject.convoId === 'string' &&
+    typeof subject.messageId === 'string'
+  ) {
+    return new MessageSubject(subject.did, subject.convoId, subject.messageId)
+  }
+
   throw new InvalidRequestError('Invalid subject')
 }
 
@@ -42,6 +52,13 @@ export const subjectFromEventRow = (row: ModerationEventRow): ModSubject => {
       row.subjectCid,
       row.subjectBlobCids ?? [],
     )
+  } else if (
+    row.subjectType === 'chat.bsky.convo.defs#messageRef' &&
+    row.subjectMessageId
+  ) {
+    const convoId =
+      typeof row.meta?.['convoId'] === 'string' ? row.meta['convoId'] : ''
+    return new MessageSubject(row.subjectDid, convoId, row.subjectMessageId)
   } else {
     return new RepoSubject(row.subjectDid)
   }
@@ -61,11 +78,16 @@ export const subjectFromStatusRow = (
 }
 
 type SubjectInfo = {
-  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
+  meta: Record<string, string> | null
 }
 
 export interface ModSubject {
@@ -74,8 +96,9 @@ export interface ModSubject {
   blobCids?: string[]
   isRepo(): this is RepoSubject
   isRecord(): this is RecordSubject
+  isMessage(): this is MessageSubject
   info(): SubjectInfo
-  lex(): RepoRef | StrongRef
+  lex(): RepoRef | StrongRef | MessageRef
 }
 
 export class RepoSubject implements ModSubject {
@@ -88,6 +111,9 @@ export class RepoSubject implements ModSubject {
   isRecord() {
     return false
   }
+  isMessage() {
+    return false
+  }
   info() {
     return {
       subjectType: 'com.atproto.admin.defs#repoRef' as const,
@@ -95,6 +121,8 @@ export class RepoSubject implements ModSubject {
       subjectUri: null,
       subjectCid: null,
       subjectBlobCids: null,
+      subjectMessageId: null,
+      meta: null,
     }
   }
   lex(): RepoRef {
@@ -124,6 +152,9 @@ export class RecordSubject implements ModSubject {
   isRecord() {
     return true
   }
+  isMessage() {
+    return false
+  }
   info() {
     return {
       subjectType: 'com.atproto.repo.strongRef' as const,
@@ -131,6 +162,8 @@ export class RecordSubject implements ModSubject {
       subjectUri: this.uri,
       subjectCid: this.cid,
       subjectBlobCids: this.blobCids ?? [],
+      subjectMessageId: null,
+      meta: null,
     }
   }
   lex(): StrongRef {
@@ -141,3 +174,41 @@ export class RecordSubject implements ModSubject {
     }
   }
 }
+
+export class MessageSubject implements ModSubject {
+  blobCids = undefined
+  recordPath = undefined
+  constructor(
+    public did: string,
+    public convoId: string,
+    public messageId: string,
+  ) {}
+  isRepo() {
+    return false
+  }
+  isRecord() {
+    return false
+  }
+  isMessage() {
+    return true
+  }
+  info() {
+    return {
+      subjectType: 'chat.bsky.convo.defs#messageRef' as const,
+      subjectDid: this.did,
+      subjectUri: null,
+      subjectCid: null,
+      subjectBlobCids: null,
+      subjectMessageId: this.messageId,
+      meta: { convoId: this.convoId },
+    }
+  }
+  lex(): MessageRef {
+    return {
+      $type: 'chat.bsky.convo.defs#messageRef',
+      did: this.did,
+      convoId: this.convoId,
+      messageId: this.messageId,
+    }
+  }
+}