@atproto/ozone 0.1.140 → 0.1.142

package/src/config/config.ts

@@ -1,5 +1,5 @@
 import assert from 'node:assert'
-import { DAY, HOUR } from '@atproto/common'
+import { DAY, HOUR, MINUTE } from '@atproto/common'
 import { OzoneEnvironment } from './env'
 
 // off-config but still from env:
@@ -15,6 +15,7 @@ export const envToCfg = (env: OzoneEnvironment): OzoneConfig => {
     did: env.serverDid,
     version: env.version,
     devMode: env.devMode,
+    serviceRecordCacheTTL: env.serviceRecordCacheTTL ?? 5 * MINUTE, // default 5 mins
   }
 
   assert(env.dbPostgresUrl, 'dbPostgresUrl is required')
@@ -124,6 +125,7 @@ export type ServiceConfig = {
   did: string
   version?: string
   devMode?: boolean
+  serviceRecordCacheTTL: number // in ms, default 5 mins
 }
 
 export type BlobDivertConfig = {

package/src/config/env.ts

@@ -8,6 +8,7 @@ export const readEnv = (): OzoneEnvironment => {
     port: envInt('OZONE_PORT'),
     publicUrl: envStr('OZONE_PUBLIC_URL'),
     serverDid: envStr('OZONE_SERVER_DID'),
+    serviceRecordCacheTTL: envInt('OZONE_SERVICE_RECORD_CACHE_TTL'),
     appviewUrl: envStr('OZONE_APPVIEW_URL'),
     appviewDid: envStr('OZONE_APPVIEW_DID'),
     appviewPushEvents: envBool('OZONE_APPVIEW_PUSH_EVENTS'),
@@ -52,6 +53,7 @@ export type OzoneEnvironment = {
   port?: number
   publicUrl?: string
   serverDid?: string
+  serviceRecordCacheTTL?: number
   appviewUrl?: string
   appviewDid?: string
   appviewPushEvents?: boolean

package/src/context.ts

@@ -17,6 +17,10 @@ import { BlobDiverter } from './daemon/blob-diverter'
 import { Database } from './db'
 import { ImageInvalidator } from './image-invalidator'
 import { ModerationService, ModerationServiceCreator } from './mod-service'
+import {
+  ModerationServiceProfile,
+  ModerationServiceProfileCreator,
+} from './mod-service/profile'
 import {
   SafelinkRuleService,
   SafelinkRuleServiceCreator,
@@ -45,6 +49,7 @@ export type AppContextOptions = {
   db: Database
   cfg: OzoneConfig
   modService: ModerationServiceCreator
+  moderationServiceProfile: ModerationServiceProfileCreator
   communicationTemplateService: CommunicationTemplateServiceCreator
   safelinkRuleService: SafelinkRuleServiceCreator
   setService: SetServiceCreator
@@ -145,6 +150,10 @@ export class AppContext {
     const settingService = SettingService.creator()
     const verificationService = VerificationService.creator()
     const verificationIssuer = VerificationIssuer.creator()
+    const moderationServiceProfile = ModerationServiceProfile.creator(
+      cfg,
+      appviewAgent,
+    )
 
     const sequencer = new Sequencer(modService(db))
 
@@ -159,6 +168,7 @@ export class AppContext {
         db,
         cfg,
         modService,
+        moderationServiceProfile,
         communicationTemplateService,
         safelinkRuleService,
         teamService,
@@ -235,6 +245,10 @@ export class AppContext {
     return this.opts.verificationIssuer
   }
 
+  get moderationServiceProfile(): ModerationServiceProfileCreator {
+    return this.opts.moderationServiceProfile
+  }
+
   get appviewAgent(): AtpAgent {
     return this.opts.appviewAgent
   }

package/src/db/migrations/20250718T150931000Z-update-appeal-reason-stats.ts

@@ -0,0 +1,311 @@
+import { Kysely, sql } from 'kysely'
+import { OZONE_APPEAL_REASON_TYPE } from '../../api/util'
+import { REASONAPPEAL } from '../../lexicon/types/com/atproto/moderation/defs'
+import { DatabaseSchemaType } from '../schema'
+import * as modEvent from '../schema/moderation_event'
+import * as recordEventsStats from '../schema/record_events_stats'
+
+export async function up(db: Kysely<any>): Promise<void> {
+  // Drop and recreate materialized views to update appeal reason counting
+  // to include both REASONAPPEAL and OZONE_APPEAL_REASON_TYPE
+  // The primary difference between the old and new query is that we were using = and != operators
+  // to match against the meta->>'reportType' field and now we use IN and NOT IN
+
+  // Drop existing materialized views in reverse dependency order
+  await db.schema
+    .dropView('account_record_events_stats')
+    .materialized()
+    .execute()
+  await db.schema.dropView('record_events_stats').materialized().execute()
+  await db.schema.dropView('account_events_stats').materialized().execute()
+
+  // Recreate account_events_stats with updated appeal counting
+  await db.schema
+    .createView('account_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .where('subjectType', '=', 'com.atproto.admin.defs#repoRef')
+        .where('subjectUri', 'is', null)
+        .select('subjectDid')
+        .select([
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NULL
+            )`.as('takedownCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NOT NULL
+            )`.as('suspendCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate'
+            )`.as('escalateCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' NOT IN (${REASONAPPEAL}, ${OZONE_APPEAL_REASON_TYPE})
+            )`.as('reportCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' IN (${REASONAPPEAL}, ${OZONE_APPEAL_REASON_TYPE})
+            )`.as('appealCount'),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  // Recreate record_events_stats with updated appeal counting
+  await db.schema
+    .createView('record_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .select([
+          'subjectDid',
+          'subjectUri',
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate')`.as(
+              'escalateCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' NOT IN (${REASONAPPEAL}, ${OZONE_APPEAL_REASON_TYPE}))`.as(
+              'reportCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' IN (${REASONAPPEAL}, ${OZONE_APPEAL_REASON_TYPE}))`.as(
+              'appealCount',
+            ),
+        ])
+        .where('subjectType', '=', 'com.atproto.repo.strongRef')
+        .where('subjectUri', 'is not', null)
+        .groupBy(['subjectDid', 'subjectUri']),
+    )
+    .execute()
+
+  // Recreate account_record_events_stats (unchanged logic, but depends on record_events_stats)
+  await db.schema
+    .createView('account_record_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<recordEventsStats.PartialDB>)
+        .selectFrom('record_events_stats')
+        .select([
+          'subjectDid',
+          (eb) =>
+            sql<number>`SUM(${eb.ref('reportCount')})::bigint`.as(
+              'totalReports',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('reportCount')} > 0)`.as(
+              'reportedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('escalateCount')} > 0)`.as(
+              'escalatedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('appealCount')} > 0)`.as(
+              'appealedCount',
+            ),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  // Recreate all indexes for the materialized views
+  await db.schema
+    .createIndex('account_events_stats_did_idx')
+    .unique()
+    .on('account_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_events_stats_suspend_count_idx')
+    .on('account_events_stats')
+    .expression(sql`"suspendCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_uri_idx')
+    .unique()
+    .on('record_events_stats')
+    .column('subjectUri')
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_did_idx')
+    .on('record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_did_idx')
+    .unique()
+    .on('account_record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_reported_count_idx')
+    .on('account_record_events_stats')
+    .expression(sql`"reportedCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+}
+
+export async function down(db: Kysely<DatabaseSchemaType>): Promise<void> {
+  // Drop the updated materialized views
+  await db.schema
+    .dropView('account_record_events_stats')
+    .materialized()
+    .execute()
+  await db.schema.dropView('record_events_stats').materialized().execute()
+  await db.schema.dropView('account_events_stats').materialized().execute()
+
+  // Recreate the original views with single appeal reason type
+  await db.schema
+    .createView('account_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .where('subjectType', '=', 'com.atproto.admin.defs#repoRef')
+        .where('subjectUri', 'is', null)
+        .select('subjectDid')
+        .select([
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NULL
+            )`.as('takedownCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventTakedown'
+              AND ${eb.ref('durationInHours')} IS NOT NULL
+            )`.as('suspendCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate'
+            )`.as('escalateCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' != ${REASONAPPEAL}
+            )`.as('reportCount'),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER(
+              WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport'
+              AND ${eb.ref('meta')} ->> 'reportType' = ${REASONAPPEAL}
+            )`.as('appealCount'),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  await db.schema
+    .createView('record_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<modEvent.PartialDB>)
+        .selectFrom('moderation_event')
+        .select([
+          'subjectDid',
+          'subjectUri',
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventEscalate')`.as(
+              'escalateCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' != 'com.atproto.moderation.defs#reasonAppeal')`.as(
+              'reportCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('action')} = 'tools.ozone.moderation.defs#modEventReport' AND ${eb.ref('meta')} ->> 'reportType' = 'com.atproto.moderation.defs#reasonAppeal')`.as(
+              'appealCount',
+            ),
+        ])
+        .where('subjectType', '=', 'com.atproto.repo.strongRef')
+        .where('subjectUri', 'is not', null)
+        .groupBy(['subjectDid', 'subjectUri']),
+    )
+    .execute()
+
+  await db.schema
+    .createView('account_record_events_stats')
+    .materialized()
+    .as(
+      (db as Kysely<recordEventsStats.PartialDB>)
+        .selectFrom('record_events_stats')
+        .select([
+          'subjectDid',
+          (eb) =>
+            sql<number>`SUM(${eb.ref('reportCount')})::bigint`.as(
+              'totalReports',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('reportCount')} > 0)`.as(
+              'reportedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('escalateCount')} > 0)`.as(
+              'escalatedCount',
+            ),
+          (eb) =>
+            sql<number>`COUNT(*) FILTER (WHERE ${eb.ref('appealCount')} > 0)`.as(
+              'appealedCount',
+            ),
+        ])
+        .groupBy('subjectDid'),
+    )
+    .execute()
+
+  // Recreate indexes
+  await db.schema
+    .createIndex('account_events_stats_did_idx')
+    .unique()
+    .on('account_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_events_stats_suspend_count_idx')
+    .on('account_events_stats')
+    .expression(sql`"suspendCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_uri_idx')
+    .unique()
+    .on('record_events_stats')
+    .column('subjectUri')
+    .execute()
+
+  await db.schema
+    .createIndex('record_events_stats_did_idx')
+    .on('record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_did_idx')
+    .unique()
+    .on('account_record_events_stats')
+    .column('subjectDid')
+    .execute()
+
+  await db.schema
+    .createIndex('account_record_events_stats_reported_count_idx')
+    .on('account_record_events_stats')
+    .expression(sql`"reportedCount" ASC NULLS FIRST`)
+    .column('subjectDid')
+    .execute()
+}

package/src/db/migrations/index.ts

@@ -29,3 +29,4 @@ export * as _20250609T110704000Z from './20250609T110704000Z-safelink'
 export * as _20250618T180246000Z from './20250618T180246000Z-add-mod-tool-to-moderation-event'
 export * as _20250701T000000000Z from './20250701T000000000Z-add-age-assurance-state'
 export * as _20250715T000000000Z from './20250715T000000000Z-add-mod-event-external-id'
+export * as _20250718T150931000Z from './20250718T150931000Z-update-appeal-reason-stats'

package/src/db/schema/moderation_event.ts

@@ -25,6 +25,7 @@ export interface ModerationEvent {
     | 'tools.ozone.moderation.defs#modEventPriorityScore'
     | 'tools.ozone.moderation.defs#ageAssuranceEvent'
     | 'tools.ozone.moderation.defs#ageAssuranceOverrideEvent'
+    | 'tools.ozone.moderation.defs#revokeAccountCredentialsEvent'
   subjectType:
     | 'com.atproto.admin.defs#repoRef'
     | 'com.atproto.repo.strongRef'

package/src/lexicon/index.ts

@@ -198,6 +198,7 @@ import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscrib
 import * as ComAtprotoTempAddReservedHandle from './types/com/atproto/temp/addReservedHandle.js'
 import * as ComAtprotoTempCheckHandleAvailability from './types/com/atproto/temp/checkHandleAvailability.js'
 import * as ComAtprotoTempCheckSignupQueue from './types/com/atproto/temp/checkSignupQueue.js'
+import * as ComAtprotoTempDereferenceScope from './types/com/atproto/temp/dereferenceScope.js'
 import * as ComAtprotoTempFetchLabels from './types/com/atproto/temp/fetchLabels.js'
 import * as ComAtprotoTempRequestPhoneVerification from './types/com/atproto/temp/requestPhoneVerification.js'
 import * as ComAtprotoTempRevokeAccountCredentials from './types/com/atproto/temp/revokeAccountCredentials.js'
@@ -289,6 +290,75 @@ export const TOOLS_OZONE_MODERATION = {
   DefsTimelineEventPlcTombstone:
     'tools.ozone.moderation.defs#timelineEventPlcTombstone',
 }
+export const TOOLS_OZONE_REPORT = {
+  DefsReasonAppeal: 'tools.ozone.report.defs#reasonAppeal',
+  DefsReasonViolenceAnimalWelfare:
+    'tools.ozone.report.defs#reasonViolenceAnimalWelfare',
+  DefsReasonViolenceThreats: 'tools.ozone.report.defs#reasonViolenceThreats',
+  DefsReasonViolenceGraphicContent:
+    'tools.ozone.report.defs#reasonViolenceGraphicContent',
+  DefsReasonViolenceSelfHarm: 'tools.ozone.report.defs#reasonViolenceSelfHarm',
+  DefsReasonViolenceGlorification:
+    'tools.ozone.report.defs#reasonViolenceGlorification',
+  DefsReasonViolenceExtremistContent:
+    'tools.ozone.report.defs#reasonViolenceExtremistContent',
+  DefsReasonViolenceTrafficking:
+    'tools.ozone.report.defs#reasonViolenceTrafficking',
+  DefsReasonViolenceOther: 'tools.ozone.report.defs#reasonViolenceOther',
+  DefsReasonSexualAbuseContent:
+    'tools.ozone.report.defs#reasonSexualAbuseContent',
+  DefsReasonSexualNCII: 'tools.ozone.report.defs#reasonSexualNCII',
+  DefsReasonSexualSextortion: 'tools.ozone.report.defs#reasonSexualSextortion',
+  DefsReasonSexualDeepfake: 'tools.ozone.report.defs#reasonSexualDeepfake',
+  DefsReasonSexualAnimal: 'tools.ozone.report.defs#reasonSexualAnimal',
+  DefsReasonSexualUnlabeled: 'tools.ozone.report.defs#reasonSexualUnlabeled',
+  DefsReasonSexualOther: 'tools.ozone.report.defs#reasonSexualOther',
+  DefsReasonChildSafetyCSAM: 'tools.ozone.report.defs#reasonChildSafetyCSAM',
+  DefsReasonChildSafetyGroom: 'tools.ozone.report.defs#reasonChildSafetyGroom',
+  DefsReasonChildSafetyMinorPrivacy:
+    'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy',
+  DefsReasonChildSafetyEndangerment:
+    'tools.ozone.report.defs#reasonChildSafetyEndangerment',
+  DefsReasonChildSafetyHarassment:
+    'tools.ozone.report.defs#reasonChildSafetyHarassment',
+  DefsReasonChildSafetyPromotion:
+    'tools.ozone.report.defs#reasonChildSafetyPromotion',
+  DefsReasonChildSafetyOther: 'tools.ozone.report.defs#reasonChildSafetyOther',
+  DefsReasonHarassmentTroll: 'tools.ozone.report.defs#reasonHarassmentTroll',
+  DefsReasonHarassmentTargeted:
+    'tools.ozone.report.defs#reasonHarassmentTargeted',
+  DefsReasonHarassmentHateSpeech:
+    'tools.ozone.report.defs#reasonHarassmentHateSpeech',
+  DefsReasonHarassmentDoxxing:
+    'tools.ozone.report.defs#reasonHarassmentDoxxing',
+  DefsReasonHarassmentOther: 'tools.ozone.report.defs#reasonHarassmentOther',
+  DefsReasonMisleadingBot: 'tools.ozone.report.defs#reasonMisleadingBot',
+  DefsReasonMisleadingImpersonation:
+    'tools.ozone.report.defs#reasonMisleadingImpersonation',
+  DefsReasonMisleadingSpam: 'tools.ozone.report.defs#reasonMisleadingSpam',
+  DefsReasonMisleadingScam: 'tools.ozone.report.defs#reasonMisleadingScam',
+  DefsReasonMisleadingSyntheticContent:
+    'tools.ozone.report.defs#reasonMisleadingSyntheticContent',
+  DefsReasonMisleadingMisinformation:
+    'tools.ozone.report.defs#reasonMisleadingMisinformation',
+  DefsReasonMisleadingOther: 'tools.ozone.report.defs#reasonMisleadingOther',
+  DefsReasonRuleSiteSecurity: 'tools.ozone.report.defs#reasonRuleSiteSecurity',
+  DefsReasonRuleStolenContent:
+    'tools.ozone.report.defs#reasonRuleStolenContent',
+  DefsReasonRuleProhibitedSales:
+    'tools.ozone.report.defs#reasonRuleProhibitedSales',
+  DefsReasonRuleBanEvasion: 'tools.ozone.report.defs#reasonRuleBanEvasion',
+  DefsReasonRuleOther: 'tools.ozone.report.defs#reasonRuleOther',
+  DefsReasonCivicElectoralProcess:
+    'tools.ozone.report.defs#reasonCivicElectoralProcess',
+  DefsReasonCivicDisclosure: 'tools.ozone.report.defs#reasonCivicDisclosure',
+  DefsReasonCivicInterference:
+    'tools.ozone.report.defs#reasonCivicInterference',
+  DefsReasonCivicMisinformation:
+    'tools.ozone.report.defs#reasonCivicMisinformation',
+  DefsReasonCivicImpersonation:
+    'tools.ozone.report.defs#reasonCivicImpersonation',
+}
 export const TOOLS_OZONE_TEAM = {
   DefsRoleAdmin: 'tools.ozone.team.defs#roleAdmin',
   DefsRoleModerator: 'tools.ozone.team.defs#roleModerator',
@@ -2843,6 +2913,18 @@ export class ComAtprotoTempNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  dereferenceScope<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      ComAtprotoTempDereferenceScope.QueryParams,
+      ComAtprotoTempDereferenceScope.HandlerInput,
+      ComAtprotoTempDereferenceScope.HandlerOutput
+    >,
+  ) {
+    const nsid = 'com.atproto.temp.dereferenceScope' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   fetchLabels<A extends Auth = void>(
     cfg: MethodConfigOrHandler<
       A,