@atproto/ozone 0.1.139 → 0.1.141

package/src/lexicon/types/app/bsky/bookmark/deleteBookmark.ts

@@ -0,0 +1,34 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+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'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.bookmark.deleteBookmark'
+
+export type QueryParams = {}
+
+export interface InputSchema {
+  uri: string
+}
+
+export interface HandlerInput {
+  encoding: 'application/json'
+  body: InputSchema
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'UnsupportedCollection'
+}
+
+export type HandlerOutput = HandlerError | void

package/src/lexicon/types/app/bsky/bookmark/getBookmarks.ts

@@ -0,0 +1,42 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+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 type * as AppBskyBookmarkDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.bookmark.getBookmarks'
+
+export type QueryParams = {
+  limit: number
+  cursor?: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  bookmarks: AppBskyBookmarkDefs.BookmarkView[]
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/app/bsky/feed/defs.ts

@@ -36,6 +36,7 @@ export interface PostView {
     | $Typed<AppBskyEmbedRecord.View>
     | $Typed<AppBskyEmbedRecordWithMedia.View>
     | { $type: string }
+  bookmarkCount?: number
   replyCount?: number
   repostCount?: number
   likeCount?: number
@@ -61,6 +62,7 @@ export interface ViewerState {
   $type?: 'app.bsky.feed.defs#viewerState'
   repost?: string
   like?: string
+  bookmarked?: boolean
   threadMuted?: boolean
   replyDisabled?: boolean
   embeddingDisabled?: boolean

package/src/lexicon/types/com/atproto/moderation/defs.ts

@@ -22,21 +22,66 @@ export type ReasonType =
   | 'com.atproto.moderation.defs#reasonRude'
   | 'com.atproto.moderation.defs#reasonOther'
   | 'com.atproto.moderation.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonViolenceAnimalWelfare'
+  | 'tools.ozone.report.defs#reasonViolenceThreats'
+  | 'tools.ozone.report.defs#reasonViolenceGraphicContent'
+  | 'tools.ozone.report.defs#reasonViolenceSelfHarm'
+  | 'tools.ozone.report.defs#reasonViolenceGlorification'
+  | 'tools.ozone.report.defs#reasonViolenceExtremistContent'
+  | 'tools.ozone.report.defs#reasonViolenceTrafficking'
+  | 'tools.ozone.report.defs#reasonViolenceOther'
+  | 'tools.ozone.report.defs#reasonSexualAbuseContent'
+  | 'tools.ozone.report.defs#reasonSexualNCII'
+  | 'tools.ozone.report.defs#reasonSexualSextortion'
+  | 'tools.ozone.report.defs#reasonSexualDeepfake'
+  | 'tools.ozone.report.defs#reasonSexualAnimal'
+  | 'tools.ozone.report.defs#reasonSexualUnlabeled'
+  | 'tools.ozone.report.defs#reasonSexualOther'
+  | 'tools.ozone.report.defs#reasonChildSafetyCSAM'
+  | 'tools.ozone.report.defs#reasonChildSafetyGroom'
+  | 'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy'
+  | 'tools.ozone.report.defs#reasonChildSafetyEndangerment'
+  | 'tools.ozone.report.defs#reasonChildSafetyHarassment'
+  | 'tools.ozone.report.defs#reasonChildSafetyPromotion'
+  | 'tools.ozone.report.defs#reasonChildSafetyOther'
+  | 'tools.ozone.report.defs#reasonHarassmentTroll'
+  | 'tools.ozone.report.defs#reasonHarassmentTargeted'
+  | 'tools.ozone.report.defs#reasonHarassmentHateSpeech'
+  | 'tools.ozone.report.defs#reasonHarassmentDoxxing'
+  | 'tools.ozone.report.defs#reasonHarassmentOther'
+  | 'tools.ozone.report.defs#reasonMisleadingBot'
+  | 'tools.ozone.report.defs#reasonMisleadingImpersonation'
+  | 'tools.ozone.report.defs#reasonMisleadingSpam'
+  | 'tools.ozone.report.defs#reasonMisleadingScam'
+  | 'tools.ozone.report.defs#reasonMisleadingSyntheticContent'
+  | 'tools.ozone.report.defs#reasonMisleadingMisinformation'
+  | 'tools.ozone.report.defs#reasonMisleadingOther'
+  | 'tools.ozone.report.defs#reasonRuleSiteSecurity'
+  | 'tools.ozone.report.defs#reasonRuleStolenContent'
+  | 'tools.ozone.report.defs#reasonRuleProhibitedSales'
+  | 'tools.ozone.report.defs#reasonRuleBanEvasion'
+  | 'tools.ozone.report.defs#reasonRuleOther'
+  | 'tools.ozone.report.defs#reasonCivicElectoralProcess'
+  | 'tools.ozone.report.defs#reasonCivicDisclosure'
+  | 'tools.ozone.report.defs#reasonCivicInterference'
+  | 'tools.ozone.report.defs#reasonCivicMisinformation'
+  | 'tools.ozone.report.defs#reasonCivicImpersonation'
   | (string & {})
 
-/** Spam: frequent unwanted promotion, replies, mentions */
+/** Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`. */
 export const REASONSPAM = `${id}#reasonSpam`
-/** Direct violation of server rules, laws, terms of service */
+/** Direct violation of server rules, laws, terms of service. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. */
 export const REASONVIOLATION = `${id}#reasonViolation`
-/** Misleading identity, affiliation, or content */
+/** Misleading identity, affiliation, or content. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingOther`. */
 export const REASONMISLEADING = `${id}#reasonMisleading`
-/** Unwanted or mislabeled sexual content */
+/** Unwanted or mislabeled sexual content. Prefer new lexicon definition `tools.ozone.report.defs#reasonSexualUnlabeled`. */
 export const REASONSEXUAL = `${id}#reasonSexual`
-/** Rude, harassing, explicit, or otherwise unwelcoming behavior */
+/** Rude, harassing, explicit, or otherwise unwelcoming behavior. Prefer new lexicon definition `tools.ozone.report.defs#reasonHarassmentOther`. */
 export const REASONRUDE = `${id}#reasonRude`
-/** Other: reports not falling under another report category */
+/** Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. */
 export const REASONOTHER = `${id}#reasonOther`
-/** Appeal: appeal a previously taken moderation action */
+/** Appeal a previously taken moderation action */
 export const REASONAPPEAL = `${id}#reasonAppeal`
 
 /** Tag describing a type of subject that might be reported. */

package/src/lexicon/types/com/atproto/temp/dereferenceScope.ts

@@ -0,0 +1,42 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+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'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.temp.dereferenceScope'
+
+export type QueryParams = {
+  /** The scope reference (starts with 'ref:') */
+  scope: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  /** The full oauth permission scope */
+  scope: string
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'InvalidScopeReference'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

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

@@ -0,0 +1,154 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+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'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'tools.ozone.report.defs'
+
+export type ReasonType =
+  | 'tools.ozone.report.defs#reasonAppeal'
+  | 'tools.ozone.report.defs#reasonViolenceAnimalWelfare'
+  | 'tools.ozone.report.defs#reasonViolenceThreats'
+  | 'tools.ozone.report.defs#reasonViolenceGraphicContent'
+  | 'tools.ozone.report.defs#reasonViolenceSelfHarm'
+  | 'tools.ozone.report.defs#reasonViolenceGlorification'
+  | 'tools.ozone.report.defs#reasonViolenceExtremistContent'
+  | 'tools.ozone.report.defs#reasonViolenceTrafficking'
+  | 'tools.ozone.report.defs#reasonViolenceOther'
+  | 'tools.ozone.report.defs#reasonSexualAbuseContent'
+  | 'tools.ozone.report.defs#reasonSexualNCII'
+  | 'tools.ozone.report.defs#reasonSexualSextortion'
+  | 'tools.ozone.report.defs#reasonSexualDeepfake'
+  | 'tools.ozone.report.defs#reasonSexualAnimal'
+  | 'tools.ozone.report.defs#reasonSexualUnlabeled'
+  | 'tools.ozone.report.defs#reasonSexualOther'
+  | 'tools.ozone.report.defs#reasonChildSafetyCSAM'
+  | 'tools.ozone.report.defs#reasonChildSafetyGroom'
+  | 'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy'
+  | 'tools.ozone.report.defs#reasonChildSafetyEndangerment'
+  | 'tools.ozone.report.defs#reasonChildSafetyHarassment'
+  | 'tools.ozone.report.defs#reasonChildSafetyPromotion'
+  | 'tools.ozone.report.defs#reasonChildSafetyOther'
+  | 'tools.ozone.report.defs#reasonHarassmentTroll'
+  | 'tools.ozone.report.defs#reasonHarassmentTargeted'
+  | 'tools.ozone.report.defs#reasonHarassmentHateSpeech'
+  | 'tools.ozone.report.defs#reasonHarassmentDoxxing'
+  | 'tools.ozone.report.defs#reasonHarassmentOther'
+  | 'tools.ozone.report.defs#reasonMisleadingBot'
+  | 'tools.ozone.report.defs#reasonMisleadingImpersonation'
+  | 'tools.ozone.report.defs#reasonMisleadingSpam'
+  | 'tools.ozone.report.defs#reasonMisleadingScam'
+  | 'tools.ozone.report.defs#reasonMisleadingSyntheticContent'
+  | 'tools.ozone.report.defs#reasonMisleadingMisinformation'
+  | 'tools.ozone.report.defs#reasonMisleadingOther'
+  | 'tools.ozone.report.defs#reasonRuleSiteSecurity'
+  | 'tools.ozone.report.defs#reasonRuleStolenContent'
+  | 'tools.ozone.report.defs#reasonRuleProhibitedSales'
+  | 'tools.ozone.report.defs#reasonRuleBanEvasion'
+  | 'tools.ozone.report.defs#reasonRuleOther'
+  | 'tools.ozone.report.defs#reasonCivicElectoralProcess'
+  | 'tools.ozone.report.defs#reasonCivicDisclosure'
+  | 'tools.ozone.report.defs#reasonCivicInterference'
+  | 'tools.ozone.report.defs#reasonCivicMisinformation'
+  | 'tools.ozone.report.defs#reasonCivicImpersonation'
+  | (string & {})
+
+/** Appeal a previously taken moderation action */
+export const REASONAPPEAL = `${id}#reasonAppeal`
+/** Animal welfare violations */
+export const REASONVIOLENCEANIMALWELFARE = `${id}#reasonViolenceAnimalWelfare`
+/** Threats or incitement */
+export const REASONVIOLENCETHREATS = `${id}#reasonViolenceThreats`
+/** Graphic violent content */
+export const REASONVIOLENCEGRAPHICCONTENT = `${id}#reasonViolenceGraphicContent`
+/** Self harm */
+export const REASONVIOLENCESELFHARM = `${id}#reasonViolenceSelfHarm`
+/** Glorification of violence */
+export const REASONVIOLENCEGLORIFICATION = `${id}#reasonViolenceGlorification`
+/** Extremist content. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONVIOLENCEEXTREMISTCONTENT = `${id}#reasonViolenceExtremistContent`
+/** Human trafficking */
+export const REASONVIOLENCETRAFFICKING = `${id}#reasonViolenceTrafficking`
+/** Other violent content */
+export const REASONVIOLENCEOTHER = `${id}#reasonViolenceOther`
+/** Adult sexual abuse content */
+export const REASONSEXUALABUSECONTENT = `${id}#reasonSexualAbuseContent`
+/** Non-consensual intimate imagery */
+export const REASONSEXUALNCII = `${id}#reasonSexualNCII`
+/** Sextortion */
+export const REASONSEXUALSEXTORTION = `${id}#reasonSexualSextortion`
+/** Deepfake adult content */
+export const REASONSEXUALDEEPFAKE = `${id}#reasonSexualDeepfake`
+/** Animal sexual abuse */
+export const REASONSEXUALANIMAL = `${id}#reasonSexualAnimal`
+/** Unlabelled adult content */
+export const REASONSEXUALUNLABELED = `${id}#reasonSexualUnlabeled`
+/** Other sexual violence content */
+export const REASONSEXUALOTHER = `${id}#reasonSexualOther`
+/** Child sexual abuse material (CSAM). These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYCSAM = `${id}#reasonChildSafetyCSAM`
+/** Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYGROOM = `${id}#reasonChildSafetyGroom`
+/** Privacy violation involving a minor */
+export const REASONCHILDSAFETYMINORPRIVACY = `${id}#reasonChildSafetyMinorPrivacy`
+/** Child endangerment. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYENDANGERMENT = `${id}#reasonChildSafetyEndangerment`
+/** Harassment or bullying of minors */
+export const REASONCHILDSAFETYHARASSMENT = `${id}#reasonChildSafetyHarassment`
+/** Promotion of child exploitation. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYPROMOTION = `${id}#reasonChildSafetyPromotion`
+/** Other child safety. These reports will be sent only be sent to the application's Moderation Authority. */
+export const REASONCHILDSAFETYOTHER = `${id}#reasonChildSafetyOther`
+/** Trolling */
+export const REASONHARASSMENTTROLL = `${id}#reasonHarassmentTroll`
+/** Targeted harassment */
+export const REASONHARASSMENTTARGETED = `${id}#reasonHarassmentTargeted`
+/** Hate speech */
+export const REASONHARASSMENTHATESPEECH = `${id}#reasonHarassmentHateSpeech`
+/** Doxxing */
+export const REASONHARASSMENTDOXXING = `${id}#reasonHarassmentDoxxing`
+/** Other harassing or hateful content */
+export const REASONHARASSMENTOTHER = `${id}#reasonHarassmentOther`
+/** Fake account or bot */
+export const REASONMISLEADINGBOT = `${id}#reasonMisleadingBot`
+/** Impersonation */
+export const REASONMISLEADINGIMPERSONATION = `${id}#reasonMisleadingImpersonation`
+/** Spam */
+export const REASONMISLEADINGSPAM = `${id}#reasonMisleadingSpam`
+/** Scam */
+export const REASONMISLEADINGSCAM = `${id}#reasonMisleadingScam`
+/** Unlabelled gen-AI or synthetic content */
+export const REASONMISLEADINGSYNTHETICCONTENT = `${id}#reasonMisleadingSyntheticContent`
+/** Harmful false claims */
+export const REASONMISLEADINGMISINFORMATION = `${id}#reasonMisleadingMisinformation`
+/** Other misleading content */
+export const REASONMISLEADINGOTHER = `${id}#reasonMisleadingOther`
+/** Hacking or system attacks */
+export const REASONRULESITESECURITY = `${id}#reasonRuleSiteSecurity`
+/** Stolen content */
+export const REASONRULESTOLENCONTENT = `${id}#reasonRuleStolenContent`
+/** Promoting or selling prohibited items or services */
+export const REASONRULEPROHIBITEDSALES = `${id}#reasonRuleProhibitedSales`
+/** Banned user returning */
+export const REASONRULEBANEVASION = `${id}#reasonRuleBanEvasion`
+/** Other */
+export const REASONRULEOTHER = `${id}#reasonRuleOther`
+/** Electoral process violations */
+export const REASONCIVICELECTORALPROCESS = `${id}#reasonCivicElectoralProcess`
+/** Disclosure & transparency violations */
+export const REASONCIVICDISCLOSURE = `${id}#reasonCivicDisclosure`
+/** Voter intimidation or interference */
+export const REASONCIVICINTERFERENCE = `${id}#reasonCivicInterference`
+/** Election misinformation */
+export const REASONCIVICMISINFORMATION = `${id}#reasonCivicMisinformation`
+/** Impersonation of electoral officials/entities */
+export const REASONCIVICIMPERSONATION = `${id}#reasonCivicImpersonation`

package/src/mod-service/profile.ts

@@ -0,0 +1,143 @@
+import AtpAgent, { AppBskyLabelerDefs } from '@atproto/api'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { OzoneConfig } from '../config'
+import {
+  REASONAPPEAL,
+  REASONMISLEADING,
+  REASONRUDE,
+  REASONSEXUAL,
+  REASONSPAM,
+  REASONVIOLATION,
+} from '../lexicon/types/com/atproto/moderation/defs'
+import { httpLogger } from '../logger'
+
+// Reverse mapping from new ozone namespaced reason types to old com.atproto namespaced reason types
+export const NEW_TO_OLD_REASON_MAPPING: Record<string, string> = {
+  'tools.ozone.report.defs#reasonMisleadingSpam': REASONSPAM,
+  'tools.ozone.report.defs#reasonRuleOther': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonMisleadingOther': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonSexualUnlabeled': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonHarassmentOther': REASONRUDE,
+  'tools.ozone.report.defs#reasonAppeal': REASONAPPEAL,
+  // Map all violence-related reasons to REASONVIOLATION
+  'tools.ozone.report.defs#reasonViolenceAnimalWelfare': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceThreats': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceGraphicContent': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceSelfHarm': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceGlorification': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceExtremistContent': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceTrafficking': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonViolenceOther': REASONVIOLATION,
+  // Map all sexual-related reasons to REASONSEXUAL
+  'tools.ozone.report.defs#reasonSexualAbuseContent': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonSexualNCII': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonSexualSextortion': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonSexualDeepfake': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonSexualAnimal': REASONSEXUAL,
+  'tools.ozone.report.defs#reasonSexualOther': REASONSEXUAL,
+  // Map all child safety reasons to REASONVIOLATION
+  'tools.ozone.report.defs#reasonChildSafetyCSAM': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyGroom': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyMinorPrivacy': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyEndangerment': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyHarassment': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyPromotion': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonChildSafetyOther': REASONVIOLATION,
+  // Map all harassment reasons to REASONRUDE
+  'tools.ozone.report.defs#reasonHarassmentTroll': REASONRUDE,
+  'tools.ozone.report.defs#reasonHarassmentTargeted': REASONRUDE,
+  'tools.ozone.report.defs#reasonHarassmentHateSpeech': REASONRUDE,
+  'tools.ozone.report.defs#reasonHarassmentDoxxing': REASONRUDE,
+  // Map all misleading reasons to REASONMISLEADING
+  'tools.ozone.report.defs#reasonMisleadingBot': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonMisleadingImpersonation': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonMisleadingScam': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonMisleadingSyntheticContent': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonMisleadingMisinformation': REASONMISLEADING,
+  // Map all rule-related reasons to REASONVIOLATION
+  'tools.ozone.report.defs#reasonRuleSiteSecurity': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonRuleStolenContent': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonRuleProhibitedSales': REASONVIOLATION,
+  'tools.ozone.report.defs#reasonRuleBanEvasion': REASONVIOLATION,
+  // Map all civic reasons to REASONMISLEADING
+  'tools.ozone.report.defs#reasonCivicElectoralProcess': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonCivicDisclosure': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonCivicInterference': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonCivicMisinformation': REASONMISLEADING,
+  'tools.ozone.report.defs#reasonCivicImpersonation': REASONMISLEADING,
+}
+
+interface CacheEntry {
+  profile: AppBskyLabelerDefs.LabelerViewDetailed | null
+  timestamp: number
+}
+
+export type ModerationServiceProfileCreator = () => ModerationServiceProfile
+
+export class ModerationServiceProfile {
+  private cache: CacheEntry | null = null
+  private CACHE_TTL: number
+
+  constructor(
+    private cfg: OzoneConfig,
+    private appviewAgent: AtpAgent,
+    cacheTTL?: number,
+  ) {
+    this.CACHE_TTL = cacheTTL || cfg.service.serviceRecordCacheTTL
+  }
+
+  static creator(
+    cfg: OzoneConfig,
+    appviewAgent: AtpAgent,
+  ): ModerationServiceProfileCreator {
+    return () => new ModerationServiceProfile(cfg, appviewAgent)
+  }
+
+  async getProfile() {
+    const now = Date.now()
+
+    if (!this.cache || now - this.cache.timestamp > this.CACHE_TTL) {
+      try {
+        const { data } = await this.appviewAgent.app.bsky.labeler.getServices({
+          dids: [this.cfg.service.did],
+          detailed: true,
+        })
+
+        if (AppBskyLabelerDefs.isLabelerViewDetailed(data.views?.[0])) {
+          this.cache = {
+            profile: data.views[0],
+            timestamp: now,
+          }
+        }
+      } catch (e) {
+        // On error, fail open
+        httpLogger.error(`Failed to fetch labeler profile: ${e?.['message']}`)
+      }
+    }
+
+    return this.cache?.profile || null
+  }
+
+  async validateReasonType(reasonType: string): Promise<string> {
+    const profile = await this.getProfile()
+
+    if (!Array.isArray(profile?.reasonTypes)) {
+      return reasonType
+    }
+
+    const supportedReasonTypes = profile.reasonTypes
+
+    // Check if the reason type is directly supported
+    if (supportedReasonTypes.includes(reasonType)) {
+      return reasonType
+    }
+
+    // Allow new reason types only if they map to a supported old reason type
+    const mappedOldReason = NEW_TO_OLD_REASON_MAPPING[reasonType]
+    if (mappedOldReason && supportedReasonTypes.includes(mappedOldReason)) {
+      return reasonType
+    }
+
+    throw new InvalidRequestError(`Invalid reason type: ${reasonType}`)
+  }
+}

package/src/mod-service/status.ts

@@ -2,10 +2,10 @@
 
 import { HOUR } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
+import { isAppealReport } from '../api/util'
 import { Database } from '../db'
 import { DatabaseSchema } from '../db/schema'
 import { jsonb } from '../db/types'
-import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
 import {
   REVIEWCLOSED,
   REVIEWESCALATED,
@@ -341,7 +341,8 @@ export const adjustModerationSubjectStatus = async (
 
   const isAppealEvent =
     action === 'tools.ozone.moderation.defs#modEventReport' &&
-    meta?.reportType === REASONAPPEAL
+    meta?.reportType &&
+    isAppealReport(`${meta.reportType}`)
 
   const subjectStatus = getSubjectStatusForModerationEvent({
     currentStatus,

package/src/tag-service/util.ts

@@ -1,5 +1,13 @@
 import { ReasonType } from '../lexicon/types/com/atproto/moderation/defs'
 
 export const getTagForReport = (reasonType: ReasonType) => {
-  return `report:${reasonType.replace('com.atproto.moderation.defs#reason', '').toLowerCase()}`
+  const reasonWithoutPrefix = reasonType
+    .replace('com.atproto.moderation.defs#reason', '')
+    .replace('tools.ozone.report.defs#reason', '')
+
+  const kebabCase = reasonWithoutPrefix
+    .replace(/([a-z])([A-Z])/g, '$1-$2')
+    .toLowerCase()
+
+  return `report:${kebabCase}`
 }

package/tests/__snapshots__/report-reason.test.ts.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`report reason createReport only passes for allowed reason types 1`] = `
+Object {
+  "createdAt": "1970-01-01T00:00:00.000Z",
+  "id": 1,
+  "reasonType": "tools.ozone.report.defs#reasonHarassmentTroll",
+  "reportedBy": "user(0)",
+  "subject": Object {
+    "$type": "com.atproto.admin.defs#repoRef",
+    "did": "user(1)",
+  },
+}
+`;