@atproto/ozone 0.1.13 → 0.1.15

package/dist/mod-service/subject.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecordSubject = exports.RepoSubject = exports.subjectFromStatusRow = exports.subjectFromEventRow = exports.subjectFromInput = void 0;
+exports.MessageSubject = exports.RecordSubject = exports.RepoSubject = exports.subjectFromStatusRow = exports.subjectFromEventRow = exports.subjectFromInput = void 0;
 const syntax_1 = require("@atproto/syntax");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const subjectFromInput = (subject, blobs) => {
@@ -16,6 +16,12 @@ const subjectFromInput = (subject, blobs) => {
         typeof subject.cid === 'string') {
         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 xrpc_server_1.InvalidRequestError('Invalid subject');
 };
 exports.subjectFromInput = subjectFromInput;
@@ -25,6 +31,11 @@ const subjectFromEventRow = (row) => {
         row.subjectCid) {
         return new RecordSubject(row.subjectUri, 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);
     }
@@ -69,6 +80,9 @@ class RepoSubject {
     isRecord() {
         return false;
     }
+    isMessage() {
+        return false;
+    }
     info() {
         return {
             subjectType: 'com.atproto.admin.defs#repoRef',
@@ -76,6 +90,8 @@ class RepoSubject {
             subjectUri: null,
             subjectCid: null,
             subjectBlobCids: null,
+            subjectMessageId: null,
+            meta: null,
         };
     }
     lex() {
@@ -134,6 +150,9 @@ class RecordSubject {
     isRecord() {
         return true;
     }
+    isMessage() {
+        return false;
+    }
     info() {
         return {
             subjectType: 'com.atproto.repo.strongRef',
@@ -141,6 +160,8 @@ class RecordSubject {
             subjectUri: this.uri,
             subjectCid: this.cid,
             subjectBlobCids: this.blobCids ?? [],
+            subjectMessageId: null,
+            meta: null,
         };
     }
     lex() {
@@ -152,4 +173,67 @@ class RecordSubject {
     }
 }
 exports.RecordSubject = RecordSubject;
+class MessageSubject {
+    constructor(did, convoId, messageId) {
+        Object.defineProperty(this, "did", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: did
+        });
+        Object.defineProperty(this, "convoId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: convoId
+        });
+        Object.defineProperty(this, "messageId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: messageId
+        });
+        Object.defineProperty(this, "blobCids", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+        Object.defineProperty(this, "recordPath", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+    }
+    isRepo() {
+        return false;
+    }
+    isRecord() {
+        return false;
+    }
+    isMessage() {
+        return true;
+    }
+    info() {
+        return {
+            subjectType: 'chat.bsky.convo.defs#messageRef',
+            subjectDid: this.did,
+            subjectUri: null,
+            subjectCid: null,
+            subjectBlobCids: null,
+            subjectMessageId: this.messageId,
+            meta: { convoId: this.convoId },
+        };
+    }
+    lex() {
+        return {
+            $type: 'chat.bsky.convo.defs#messageRef',
+            did: this.did,
+            convoId: this.convoId,
+            messageId: this.messageId,
+        };
+    }
+}
+exports.MessageSubject = MessageSubject;
 //# sourceMappingURL=subject.js.map

package/dist/mod-service/subject.js.map

@@ -1 +1 @@
-{"version":3,"file":"subject.js","sourceRoot":"","sources":["../../src/mod-service/subject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subject.js","sourceRoot":"","sources":["../../src/mod-service/subject.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -31,7 +31,7 @@
     "pino-http": "^8.2.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.12.9",
+    "@atproto/api": "^0.12.11",
     "@atproto/common": "^0.4.0",
     "@atproto/crypto": "^0.4.0",
     "@atproto/identity": "^0.4.0",
@@ -51,10 +51,10 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "@atproto/lex-cli": "^0.4.0",
-    "@atproto/pds": "^0.4.20"
+    "@atproto/pds": "^0.4.23"
   },
   "scripts": {
-    "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/tools/ozone/*/*",
+    "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
     "build": "tsc --build tsconfig.build.json",
     "start": "node --enable-source-maps dist/bin.js",
     "test": "../dev-infra/with-test-redis-and-db.sh jest",

package/src/api/chat/getActorMetadata.ts

@@ -0,0 +1,22 @@
+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.getActorMetadata({
+    auth: ctx.authVerifier.modOrAdminToken,
+    handler: async ({ params }) => {
+      if (!ctx.chatAgent) {
+        throw new InvalidRequestError('No chat agent configured')
+      }
+      const res = await ctx.chatAgent.api.chat.bsky.moderation.getActorMetadata(
+        params,
+        await ctx.chatAuth(),
+      )
+      return {
+        encoding: 'application/json',
+        body: res.data,
+      }
+    },
+  })
+}

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