clarify in content hider if label is on overall account (#9264)

forked from jollywhoppers.com/witchsky.app

Bluesky app fork with some witchin' additions 💫

* clarify in content hider if label is on overall account

* fix bool typo

* Update src/components/moderation/ContentHider.tsx

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

* rename variable for clarity

---------

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

authored by bnewbold.net

Samuel Newman and committed by

GitHub 4 months ago 28e132ae 25a2a2c7

+8 -1

2 changed files

expand all

unified split

src

components

moderation

ContentHider.tsx

lib

moderation

useModerationCauseDescription.ts

+6 -1

src/components/moderation/ContentHider.tsx

··· 85 blur.type !== 'label' || 86 (blur.type === 'label' && blur.source.type !== 'user') 87 ) { 88 - return desc.name 89 } 90 91 let hasAdultContentLabel = false ··· 127 modui?.blurs, 128 blur, 129 desc.name, 130 labelDefs, 131 i18n.locale, 132 globalLabelStrings,

··· 85 blur.type !== 'label' || 86 (blur.type === 'label' && blur.source.type !== 'user') 87 ) { 88 + if (desc.isSubjectAccount) { 89 + return _(msg`${desc.name} (Account)`) 90 + } else { 91 + return desc.name 92 + } 93 } 94 95 let hasAdultContentLabel = false ··· 131 modui?.blurs, 132 blur, 133 desc.name, 134 + desc.isSubjectAccount, 135 labelDefs, 136 i18n.locale, 137 globalLabelStrings,

src/lib/moderation/useModerationCauseDescription.ts

··· 28 sourceType?: ModerationCauseSource['type'] 29 sourceAvi?: string 30 sourceDid?: string 31 } 32 33 export function useModerationCauseDescription( ··· 162 sourceType: cause.source.type, 163 sourceAvi: labeler?.creator.avatar, 164 sourceDid: cause.label.src, 165 } 166 } 167 // should never happen

··· 28 sourceType?: ModerationCauseSource['type'] 29 sourceAvi?: string 30 sourceDid?: string 31 + isSubjectAccount?: boolean 32 } 33 34 export function useModerationCauseDescription( ··· 163 sourceType: cause.source.type, 164 sourceAvi: labeler?.creator.avatar, 165 sourceDid: cause.label.src, 166 + isSubjectAccount: cause.label.uri.startsWith('did:'), 167 } 168 } 169 // should never happen