:erge branch '3p-moderators' of github.com:bluesky-social/social-app into 3p-moderators

src/components/moderation/ContentHider.tsx

@@ -127,7 +127,7 @@ export function ContentHider({
           label={_(
             msg`Learn more about the moderation applied to this content.`,
           )}
-          style={[a.pt_xs]}>
+          style={[a.pt_sm]}>
           {state => (
             <Text
               style={[
@@ -138,17 +138,19 @@ export function ContentHider({
                 t.atoms.text_contrast_medium,
                 a.text_left,
               ]}>
-              <Trans>
+              {desc.sourceType === 'user' ? (
-                Labeled by {sanitizeDisplayName(desc.source!)}.{' '}
+                <Trans>Labeled by the author.</Trans>
-                <Text
+              ) : (
-                  style={[
+                <Trans>Labeled by {sanitizeDisplayName(desc.source!)}.</Trans>
-                    {color: t.palette.primary_500},
+              )}{' '}
-                    a.text_sm,
+              <Text
-                    state.hovered && [web({textDecoration: 'underline'})],
+                style={[
-                  ]}>
+                  {color: t.palette.primary_500},
-                  Learn more.
+                  a.text_sm,
-                </Text>
+                  state.hovered && [web({textDecoration: 'underline'})],
-              </Trans>
+                ]}>
+                <Trans>Learn more.</Trans>
+              </Text>
             </Text>
           )}
         </Button>

src/components/moderation/ModerationDetailsDialog.tsx

@@ -124,12 +124,16 @@ function ModerationDetailsDialogInner({
           <Text style={[t.atoms.text, a.text_md, a.leading_snug, a.mt_lg]}>
             <Trans>
               This label was applied by{' '}
-              <InlineLink
+              {modcause.source.type === 'user' ? (
-                to={makeProfileLink({did: modcause.label.src, handle: ''})}
+                'the author'
-                onPress={() => control.close()}
+              ) : (
-                style={a.text_md}>
+                <InlineLink
-                @{desc.source}
+                  to={makeProfileLink({did: modcause.label.src, handle: ''})}
-              </InlineLink>
+                  onPress={() => control.close()}
+                  style={a.text_md}>
+                  @{desc.source}
+                </InlineLink>
+              )}
               .
             </Trans>
           </Text>

src/lib/moderation/useModerationCauseDescription.ts

@@ -1,4 +1,4 @@
-import {ModerationCause} from '@atproto/api'
+import {ModerationCause, ModerationCauseSource} from '@atproto/api'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 import {useGlobalLabelStrings} from './useGlobalLabelStrings'
@@ -16,6 +16,7 @@ export interface ModerationCauseDescription {
   name: string
   description: string
   source?: string
+  sourceType?: ModerationCauseSource['type']
 }
 
 export function useModerationCauseDescription(
@@ -114,7 +115,11 @@ export function useModerationCauseDescription(
           : CircleInfo,
       name: strings.name,
       description: strings.description,
-      source: labeler?.creator.displayName || labeler?.creator.handle,
+      source:
+        labeler?.creator.displayName ||
+        (labeler?.creator.handle ? '@' + labeler?.creator.handle : undefined) ||
+        cause.label.src,
+      sourceType: cause.source.type,
     }
   }
   // should never happen

src/view/com/posts/FeedItem.tsx

@@ -294,14 +294,12 @@ let FeedItemInner = ({
             </View>
           )}
           <LabelsOnMyPost post={post} />
-          <View style={[a.pb_sm]}>
+          <PostContent
-            <PostContent
+            moderation={moderation}
-              moderation={moderation}
+            richText={richText}
-              richText={richText}
+            postEmbed={post.embed}
-              postEmbed={post.embed}
+            postAuthor={post.author}
-              postAuthor={post.author}
+          />
-            />
-          </View>
           <PostCtrls
             post={post}
             record={record}
@@ -364,7 +362,9 @@ let PostContent = ({
         />
       ) : undefined}
       {postEmbed ? (
-        <PostEmbeds embed={postEmbed} moderation={moderation} />
+        <View style={[a.pb_sm]}>
+          <PostEmbeds embed={postEmbed} moderation={moderation} />
+        </View>
       ) : null}
     </ContentHider>
   )