diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-08-03 22:08:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-03 22:08:30 -0700 |
commit | b154d3ea21bcca48594aa397420b0f6718dbf7f3 (patch) | |
tree | 31d51cd32cfeabc78d647cc068f5f84551f7a1b0 /src/view/com/profile/ProfileHeader.tsx | |
parent | 3ae5a6b63134f6aa57eba4fba18e4ad136623e20 (diff) | |
download | voidsky-b154d3ea21bcca48594aa397420b0f6718dbf7f3.tar.zst |
Labeling & moderation updates [DRAFT] (#1057)
* First pass moving to the new labeling sdk (it compiles) * Correct behaviors around interpreting label moderation * Improve moderation state rendering * Improve hiders and alerts * Improve handling of mutes * Improve profile warnings * Add profile blurring to profile header * Add blocks to test cases * Render labels on profile cards, do not filter * Filter profiles from suggestions using moderation * Apply profile blurring to ProfileCard * Handle blocked and deleted quote posts * Temporarily translate content filtering settings to new labels * Fix types * Tune ContentHider & PostHider click targets * Put a warning on profilecard label pills * Fix screenhider learnmore link on mobile * Enforce no-override on user avatar * Dont enumerate profile blur-media labels in alerts * Fixes to muted posts (esp quotes of muted users) * Fixes to account/profile warnings * Bump @atproto/api@0.5.0 * Bump @atproto/api@0.5.1 * Fix tests * 1.43 * Remove log * Bump @atproto/api@0.5.2
Diffstat (limited to 'src/view/com/profile/ProfileHeader.tsx')
-rw-r--r-- | src/view/com/profile/ProfileHeader.tsx | 74 |
1 files changed, 10 insertions, 64 deletions
diff --git a/src/view/com/profile/ProfileHeader.tsx b/src/view/com/profile/ProfileHeader.tsx index a372f0d81..f8531d76c 100644 --- a/src/view/com/profile/ProfileHeader.tsx +++ b/src/view/com/profile/ProfileHeader.tsx @@ -21,15 +21,13 @@ import * as Toast from '../util/Toast' import {LoadingPlaceholder} from '../util/LoadingPlaceholder' import {Text} from '../util/text/Text' import {ThemedText} from '../util/text/ThemedText' -import {TextLink} from '../util/Link' import {RichText} from '../util/text/RichText' import {UserAvatar} from '../util/UserAvatar' import {UserBanner} from '../util/UserBanner' -import {ProfileHeaderWarnings} from '../util/moderation/ProfileHeaderWarnings' +import {ProfileHeaderAlerts} from '../util/moderation/ProfileHeaderAlerts' import {usePalette} from 'lib/hooks/usePalette' import {useAnalytics} from 'lib/analytics/analytics' import {NavigationProp} from 'lib/routes/types' -import {listUriToHref} from 'lib/strings/url-helpers' import {isDesktopWeb, isNative} from 'platform/detection' import {FollowState} from 'state/models/cache/my-follows' import {shareUrl} from 'lib/sharing' @@ -116,7 +114,10 @@ const ProfileHeaderLoaded = observer( }, [navigation]) const onPressAvi = React.useCallback(() => { - if (view.avatar) { + if ( + view.avatar && + !(view.moderation.avatar.blur && view.moderation.avatar.noOverride) + ) { store.shell.openLightbox(new ProfileImageLightbox(view)) } }, [store, view]) @@ -434,6 +435,7 @@ const ProfileHeaderLoaded = observer( style={[pal.text, styles.title]}> {sanitizeDisplayName( view.displayName || sanitizeHandle(view.handle), + view.moderation.profile, )} </Text> </View> @@ -494,7 +496,9 @@ const ProfileHeaderLoaded = observer( </Text> </Text> </View> - {view.descriptionRichText ? ( + {view.description && + view.descriptionRichText && + !view.moderation.profile.blur ? ( <RichText testID="profileHeaderDescription" style={[styles.description, pal.text]} @@ -504,52 +508,7 @@ const ProfileHeaderLoaded = observer( ) : undefined} </> )} - <ProfileHeaderWarnings moderation={view.moderation.view} /> - <View style={styles.moderationLines}> - {view.viewer.blocking ? ( - <View - testID="profileHeaderBlockedNotice" - style={[styles.moderationNotice, pal.viewLight]}> - <FontAwesomeIcon icon="ban" style={[pal.text]} /> - <Text type="lg-medium" style={pal.text}> - Account blocked - </Text> - </View> - ) : view.viewer.muted ? ( - <View - testID="profileHeaderMutedNotice" - style={[styles.moderationNotice, pal.viewLight]}> - <FontAwesomeIcon - icon={['far', 'eye-slash']} - style={[pal.text]} - /> - <Text type="lg-medium" style={pal.text}> - Account muted{' '} - {view.viewer.mutedByList && ( - <Text type="lg-medium" style={pal.text}> - by{' '} - <TextLink - type="lg-medium" - style={pal.link} - href={listUriToHref(view.viewer.mutedByList.uri)} - text={view.viewer.mutedByList.name} - /> - </Text> - )} - </Text> - </View> - ) : undefined} - {view.viewer.blockedBy && ( - <View - testID="profileHeaderBlockedNotice" - style={[styles.moderationNotice, pal.viewLight]}> - <FontAwesomeIcon icon="ban" style={[pal.text]} /> - <Text type="lg-medium" style={pal.text}> - This account has blocked you - </Text> - </View> - )} - </View> + <ProfileHeaderAlerts moderation={view.moderation} /> </View> {!isDesktopWeb && !hideBackButton && ( <TouchableWithoutFeedback @@ -693,19 +652,6 @@ const styles = StyleSheet.create({ paddingVertical: 2, }, - moderationLines: { - gap: 6, - }, - - moderationNotice: { - flexDirection: 'row', - alignItems: 'center', - borderRadius: 8, - paddingHorizontal: 16, - paddingVertical: 14, - gap: 8, - }, - br40: {borderRadius: 40}, br50: {borderRadius: 50}, }) |