diff options
author | Paul Frazee <pfrazee@gmail.com> | 2023-12-23 15:16:23 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-23 15:16:23 -0800 |
commit | 7d6b7d2fa6ec074db3f38785e46834f826c82772 (patch) | |
tree | 9f104d83b62643d3c8f835778f6b042f0e2fb6ae | |
parent | b922b8382084eeff3ee95a349eeb9cd0a610745c (diff) | |
download | voidsky-7d6b7d2fa6ec074db3f38785e46834f826c82772.tar.zst |
Fix some account filtering behaviors (#2290)
* Fix: don't filter ProfileCards out of certain lists * Fix: don't filter ProfileCards and autocomplete based on mutes
-rw-r--r-- | src/state/queries/actor-autocomplete.ts | 2 | ||||
-rw-r--r-- | src/view/com/lists/ListMembers.tsx | 1 | ||||
-rw-r--r-- | src/view/com/profile/ProfileCard.tsx | 8 | ||||
-rw-r--r-- | src/view/screens/ModerationBlockedAccounts.tsx | 1 | ||||
-rw-r--r-- | src/view/screens/ModerationMutedAccounts.tsx | 1 |
5 files changed, 11 insertions, 2 deletions
diff --git a/src/state/queries/actor-autocomplete.ts b/src/state/queries/actor-autocomplete.ts index 709a15b40..785e29765 100644 --- a/src/state/queries/actor-autocomplete.ts +++ b/src/state/queries/actor-autocomplete.ts @@ -112,7 +112,7 @@ function computeSuggestions( } return items.filter(profile => { const mod = moderateProfile(profile, moderationOpts) - return !mod.account.filter + return !mod.account.filter && mod.account.cause?.type !== 'muted' }) } diff --git a/src/view/com/lists/ListMembers.tsx b/src/view/com/lists/ListMembers.tsx index 2aef7d766..932f4b512 100644 --- a/src/view/com/lists/ListMembers.tsx +++ b/src/view/com/lists/ListMembers.tsx @@ -180,6 +180,7 @@ export function ListMembers({ profile={(item as AppBskyGraphDefs.ListItemView).subject} renderButton={renderMemberButton} style={{paddingHorizontal: isMobile ? 8 : 14, paddingVertical: 4}} + noModFilter /> ) }, diff --git a/src/view/com/profile/ProfileCard.tsx b/src/view/com/profile/ProfileCard.tsx index c5b2dc528..ef95f5924 100644 --- a/src/view/com/profile/ProfileCard.tsx +++ b/src/view/com/profile/ProfileCard.tsx @@ -27,6 +27,7 @@ import {useSession} from '#/state/session' export function ProfileCard({ testID, profile: profileUnshadowed, + noModFilter, noBg, noBorder, followers, @@ -35,6 +36,7 @@ export function ProfileCard({ }: { testID?: string profile: AppBskyActorDefs.ProfileViewBasic + noModFilter?: boolean noBg?: boolean noBorder?: boolean followers?: AppBskyActorDefs.ProfileView[] | undefined @@ -50,7 +52,11 @@ export function ProfileCard({ return null } const moderation = moderateProfile(profile, moderationOpts) - if (moderation.account.filter) { + if ( + !noModFilter && + moderation.account.filter && + moderation.account.cause?.type !== 'muted' + ) { return null } diff --git a/src/view/screens/ModerationBlockedAccounts.tsx b/src/view/screens/ModerationBlockedAccounts.tsx index 8f6e2f729..bada3ea93 100644 --- a/src/view/screens/ModerationBlockedAccounts.tsx +++ b/src/view/screens/ModerationBlockedAccounts.tsx @@ -92,6 +92,7 @@ export function ModerationBlockedAccounts({}: Props) { testID={`blockedAccount-${index}`} key={item.did} profile={item} + noModFilter /> ) return ( diff --git a/src/view/screens/ModerationMutedAccounts.tsx b/src/view/screens/ModerationMutedAccounts.tsx index 41aee9f2f..67118e530 100644 --- a/src/view/screens/ModerationMutedAccounts.tsx +++ b/src/view/screens/ModerationMutedAccounts.tsx @@ -92,6 +92,7 @@ export function ModerationMutedAccounts({}: Props) { testID={`mutedAccount-${index}`} key={item.did} profile={item} + noModFilter /> ) return ( |