[Reporting] Add new reporting categories and reasons (#9079)

* start adding new report reasons * cleanup * use updated types * cleanup open/closed logic * other fix * state fix * rename type * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/index.tsx Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * Update src/components/moderation/ReportDialog/utils/useReportOptions.ts Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> * add mapping * Replace consts and maps using exported values * Map to deprecated reason if necessary, send some reports only to Bluesky * Use only new report reason types * Cleanup * Bump package, integrate new reasons * Adjust sorting, return type, integrate feedback * Just remove sort * Finish 'other' handling * Update descriptions * Just invert filter logic, no functional change but feels more correct * Clarify handling * fix deep imports * fix type error * [Reporting] Integrate new `ReportDialog` into DMs (#9213) * Update types, fork copy for convo vs message * Integrate in remaining spots * Replace DoneStep with separate dialog that opens after reporting * Handle profile error state by just showing a success message * Delete old dms ReportDialog * Chats only go to bsky * Only open block or delete dialog if submitted successfully * make close button always large * prevent expansion of blockordelete dialog * Delete old report dialog (#9214)e * Skip labeler selection for Bluesky-only cases * Rename AfterReportDialog --------- Co-authored-by: Samuel Newman <mozzius@protonmail.com> --------- Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com> Co-authored-by: Eric Bailey <git@esb.lol> Co-authored-by: Samuel Newman <mozzius@protonmail.com>
2025-11-06 13:40:13 -08:00
parent fd14bbfef9
commit d6ca9e6b41
20 changed files with 985 additions and 1369 deletions
@@ -9,6 +9,7 @@ import {useMutation} from '@tanstack/react-query'

 import {logger} from '#/logger'
 import {useAgent} from '#/state/session'
+import {NEW_TO_OLD_REASONS_MAP} from './const'
 import {type ReportState} from './state'
 import {type ParsedReportSubject} from './types'

@@ -31,6 +32,26 @@ export function useSubmitReportMutation() {
        throw new Error(_(msg`Please select a moderation service`))
      }

+      const labeler = state.selectedLabeler
+      const labelerSupportedReasonTypes = labeler.reasonTypes || []
+
+      let reasonType = state.selectedOption.reason
+      const backwardsCompatibleReasonType = NEW_TO_OLD_REASONS_MAP[reasonType]
+      const supportsNewReasonType =
+        labelerSupportedReasonTypes.includes(reasonType)
+      const supportsOldReasonType = labelerSupportedReasonTypes.includes(
+        backwardsCompatibleReasonType,
+      )
+
+      /*
+       * Only fall back for backwards compatibility if the labeler
+       * does not support the new reason type. If the labeler does not declare
+       * supported reason types, send the new version.
+       */
+      if (supportsOldReasonType && !supportsNewReasonType) {
+        reasonType = backwardsCompatibleReasonType
+      }
+
      let report:
        | ComAtprotoModerationCreateReport.InputSchema
        | (Omit<ComAtprotoModerationCreateReport.InputSchema, 'subject'> & {
@@ -40,7 +61,7 @@ export function useSubmitReportMutation() {
      switch (subject.type) {
        case 'account': {
          report = {
-            reasonType: state.selectedOption.reason,
+            reasonType,
            reason: state.details,
            subject: {
              $type: 'com.atproto.admin.defs#repoRef',
@@ -54,7 +75,7 @@ export function useSubmitReportMutation() {
        case 'feed':
        case 'starterPack': {
          report = {
-            reasonType: state.selectedOption.reason,
+            reasonType,
            reason: state.details,
            subject: {
              $type: 'com.atproto.repo.strongRef',
@@ -64,9 +85,9 @@ export function useSubmitReportMutation() {
          }
          break
        }
-        case 'chatMessage': {
+        case 'convoMessage': {
          report = {
-            reasonType: state.selectedOption.reason,
+            reasonType,
            reason: state.details,
            subject: {
              $type: 'chat.bsky.convo.defs#messageRef',
@@ -82,7 +103,7 @@ export function useSubmitReportMutation() {
      if (__DEV__) {
        logger.info('Submitting report', {
          labeler: {
-            handle: state.selectedLabeler.creator.handle,
+            handle: labeler.creator.handle,
          },
          report,
        })
@@ -90,7 +111,7 @@ export function useSubmitReportMutation() {
        await agent.createModerationReport(report, {
          encoding: 'application/json',
          headers: {
-            'atproto-proxy': `${state.selectedLabeler.creator.did}#atproto_labeler`,
+            'atproto-proxy': `${labeler.creator.did}#atproto_labeler`,
          },
        })
      }