From e120bfa6444dcf6949c90e8dc4333ff33764c769 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Mon, 3 Nov 2025 10:42:25 -0600
Subject: [PATCH] Skip labeler selection for Bluesky-only cases

---
 .../moderation/ReportDialog/index.tsx         | 194 ++++++++++--------
 1 file changed, 113 insertions(+), 81 deletions(-)

diff --git a/src/components/moderation/ReportDialog/index.tsx b/src/components/moderation/ReportDialog/index.tsx
index c45047d328..a264d12bc2 100644
--- a/src/components/moderation/ReportDialog/index.tsx
+++ b/src/components/moderation/ReportDialog/index.tsx
@@ -113,6 +113,13 @@ function Inner(props: ReportDialogProps) {
   const [isPending, setPending] = React.useState(false)
   const [isSuccess, setSuccess] = React.useState(false)
 
+  // some reasons ONLY go to Bluesky
+  const isBskyOnlyReason = state?.selectedOption?.reason
+    ? BSKY_LABELER_ONLY_REPORT_REASONS.has(state.selectedOption.reason)
+    : false
+  // some subjects (chats) only go to Bluesky
+  const isBskyOnlySubject = props.subject.type === 'convoMessage'
+
   /**
    * Labelers that support this `subject` and its NSID collection
    */
@@ -139,12 +146,6 @@ function Inner(props: ReportDialogProps) {
       })
       .filter(l => {
         if (!state.selectedOption) return false
-        // some reasons ONLY go to Bluesky
-        const isBskyOnlyReason = BSKY_LABELER_ONLY_REPORT_REASONS.has(
-          state.selectedOption.reason,
-        )
-        // some subjects (chats) only go to Bluesky
-        const isBskyOnlySubject = props.subject.type === 'convoMessage'
         if (isBskyOnlyReason || isBskyOnlySubject) {
           return l.creator.did === BSKY_LABELER_DID
         }
@@ -159,10 +160,25 @@ function Inner(props: ReportDialogProps) {
           )
         )
       })
-  }, [props, allLabelers, state.selectedOption])
+  }, [
+    props,
+    allLabelers,
+    state.selectedOption,
+    isBskyOnlyReason,
+    isBskyOnlySubject,
+  ])
   const hasSupportedLabelers = !!supportedLabelers.length
   const hasSingleSupportedLabeler = supportedLabelers.length === 1
 
+  /**
+   * We skip the select labeler step if there's only one possible labeler, and
+   * that labeler is Bluesky (which is the case for chat reports and certain
+   * reason types). We'll use this below to adjust the indexing and skip the
+   * step in the UI.
+   */
+  const isAlwaysBskyLabeler =
+    hasSingleSupportedLabeler && (isBskyOnlyReason || isBskyOnlySubject)
+
   const onSubmit = React.useCallback(async () => {
     dispatch({type: 'clearError'})
 
@@ -376,88 +392,104 @@ function Inner(props: ReportDialogProps) {
           ) : null}
         </StepOuter>
 
-        <StepOuter>
-          <StepTitle
-            index={3}
-            title={_(msg`Select moderation service`)}
-            activeIndex1={state.activeStepIndex1}
+        {isAlwaysBskyLabeler ? (
+          <ActionOnce
+            check={() => !state.selectedLabeler}
+            callback={() => {
+              dispatch({
+                type: 'selectLabeler',
+                labeler: supportedLabelers[0],
+              })
+            }}
           />
-          {state.activeStepIndex1 >= 3 && (
-            <>
-              {state.selectedLabeler ? (
-                <>
-                  {hasSingleSupportedLabeler ? (
-                    <LabelerCard labeler={state.selectedLabeler} />
-                  ) : (
-                    <View style={[a.flex_row, a.align_center, a.gap_md]}>
-                      <View style={[a.flex_1]}>
-                        <LabelerCard labeler={state.selectedLabeler} />
+        ) : (
+          <StepOuter>
+            <StepTitle
+              index={3}
+              title={_(msg`Select moderation service`)}
+              activeIndex1={state.activeStepIndex1}
+            />
+            {state.activeStepIndex1 >= 3 && (
+              <>
+                {state.selectedLabeler ? (
+                  <>
+                    {hasSingleSupportedLabeler ? (
+                      <LabelerCard labeler={state.selectedLabeler} />
+                    ) : (
+                      <View style={[a.flex_row, a.align_center, a.gap_md]}>
+                        <View style={[a.flex_1]}>
+                          <LabelerCard labeler={state.selectedLabeler} />
+                        </View>
+                        <Button
+                          label={_(msg`Change moderation service`)}
+                          size="tiny"
+                          variant="solid"
+                          color="secondary"
+                          shape="round"
+                          onPress={() => {
+                            dispatch({type: 'clearLabeler'})
+                          }}>
+                          <ButtonIcon icon={X} />
+                        </Button>
                       </View>
-                      <Button
-                        label={_(msg`Change moderation service`)}
-                        size="tiny"
-                        variant="solid"
-                        color="secondary"
-                        shape="round"
-                        onPress={() => {
-                          dispatch({type: 'clearLabeler'})
-                        }}>
-                        <ButtonIcon icon={X} />
-                      </Button>
-                    </View>
-                  )}
-                </>
-              ) : (
-                <>
-                  {hasSupportedLabelers ? (
-                    <View style={[a.gap_sm]}>
-                      {hasSingleSupportedLabeler ? (
-                        <>
-                          <LabelerCard labeler={supportedLabelers[0]} />
-                          <ActionOnce
-                            check={() => !state.selectedLabeler}
-                            callback={() => {
-                              dispatch({
-                                type: 'selectLabeler',
-                                labeler: supportedLabelers[0],
-                              })
-                            }}
-                          />
-                        </>
-                      ) : (
-                        <>
-                          {supportedLabelers.map(l => (
-                            <LabelerCard
-                              key={l.creator.did}
-                              labeler={l}
-                              onSelect={() => {
-                                dispatch({type: 'selectLabeler', labeler: l})
+                    )}
+                  </>
+                ) : (
+                  <>
+                    {hasSupportedLabelers ? (
+                      <View style={[a.gap_sm]}>
+                        {hasSingleSupportedLabeler ? (
+                          <>
+                            <LabelerCard labeler={supportedLabelers[0]} />
+                            <ActionOnce
+                              check={() => !state.selectedLabeler}
+                              callback={() => {
+                                dispatch({
+                                  type: 'selectLabeler',
+                                  labeler: supportedLabelers[0],
+                                })
                               }}
                             />
-                          ))}
-                        </>
-                      )}
-                    </View>
-                  ) : (
-                    // should never happen in our app
-                    <Admonition.Admonition type="warning">
-                      <Trans>
-                        Unfortunately, none of your subscribed labelers supports
-                        this report type.
-                      </Trans>
-                    </Admonition.Admonition>
-                  )}
-                </>
-              )}
-            </>
-          )}
-        </StepOuter>
+                          </>
+                        ) : (
+                          <>
+                            {supportedLabelers.map(l => (
+                              <LabelerCard
+                                key={l.creator.did}
+                                labeler={l}
+                                onSelect={() => {
+                                  dispatch({type: 'selectLabeler', labeler: l})
+                                }}
+                              />
+                            ))}
+                          </>
+                        )}
+                      </View>
+                    ) : (
+                      // should never happen in our app
+                      <Admonition.Admonition type="warning">
+                        <Trans>
+                          Unfortunately, none of your subscribed labelers
+                          supports this report type.
+                        </Trans>
+                      </Admonition.Admonition>
+                    )}
+                  </>
+                )}
+              </>
+            )}
+          </StepOuter>
+        )}
 
         <StepOuter>
           <StepTitle
-            index={4}
+            index={isAlwaysBskyLabeler ? 3 : 4}
             title={_(msg`Submit report`)}
-            activeIndex1={state.activeStepIndex1}
+            activeIndex1={
+              isAlwaysBskyLabeler
+                ? state.activeStepIndex1 - 1
+                : state.activeStepIndex1
+            }
           />
           {state.activeStepIndex1 === 4 && (
             <>