about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Bailey <git@esb.lol>2024-06-10 20:49:28 -0500
committerGitHub <noreply@github.com>2024-06-11 03:49:28 +0200
commit848151c4f96dd0e60feb8c5845da2970425ce968 (patch)
tree367c789c0c93723d8af11b41be954f4e15a2323d
parent7cac413f3b397fee95681033f075d51c7c4ee153 (diff)
downloadvoidsky-848151c4f96dd0e60feb8c5845da2970425ce968.tar.zst
Revert "Fix undefined block (#4471)" (#4472)
This reverts commit 7cac413f3b397fee95681033f075d51c7c4ee153.
-rw-r--r--src/components/ProfileHoverCard/index.web.tsx9
-rw-r--r--src/view/com/posts/FeedItem.tsx17
2 files changed, 4 insertions, 22 deletions
diff --git a/src/components/ProfileHoverCard/index.web.tsx b/src/components/ProfileHoverCard/index.web.tsx
index e85ad0c37..024867b1a 100644
--- a/src/components/ProfileHoverCard/index.web.tsx
+++ b/src/components/ProfileHoverCard/index.web.tsx
@@ -370,10 +370,7 @@ function Inner({
     profile: profileShadow,
     logContext: 'ProfileHoverCard',
   })
-  const isProfileBlocked =
-    profile.viewer?.blocking ||
-    profile.viewer?.blockedBy ||
-    profile.viewer?.blockingByList
+  const blockHide = profile.viewer?.blocking || profile.viewer?.blockedBy
   const following = formatCount(profile.followsCount || 0)
   const followers = formatCount(profile.followersCount || 0)
   const pluralizedFollowers = plural(profile.followersCount || 0, {
@@ -404,7 +401,7 @@ function Inner({
           />
         </Link>
 
-        {!isMe && !isProfileBlocked && (
+        {!isMe && (
           <Button
             size="small"
             color={profileShadow.viewer?.following ? 'secondary' : 'primary'}
@@ -442,7 +439,7 @@ function Inner({
         </View>
       </Link>
 
-      {!isProfileBlocked && (
+      {!blockHide && (
         <>
           <View style={[a.flex_row, a.flex_wrap, a.gap_md, a.pt_xs]}>
             <InlineLinkText
diff --git a/src/view/com/posts/FeedItem.tsx b/src/view/com/posts/FeedItem.tsx
index 9f6dd3322..675f23a88 100644
--- a/src/view/com/posts/FeedItem.tsx
+++ b/src/view/com/posts/FeedItem.tsx
@@ -196,12 +196,6 @@ let FeedItemInner = ({
     },
   ]
 
-  const isParentBlocked = Boolean(
-    parentAuthor?.viewer?.blockedBy ||
-      parentAuthor?.viewer?.blocking ||
-      parentAuthor?.viewer?.blockingByList,
-  )
-
   return (
     <Link
       testID={`feedItem-by-${post.author.handle}`}
@@ -326,16 +320,7 @@ let FeedItemInner = ({
             onOpenAuthor={onOpenAuthor}
           />
           {!isThreadChild && showReplyTo && parentAuthor && (
-            <ReplyToLabel
-              profile={
-                isParentBlocked
-                  ? {
-                      ...parentAuthor,
-                      displayName: _(msg`a blocked user`),
-                    }
-                  : parentAuthor
-              }
-            />
+            <ReplyToLabel profile={parentAuthor} />
           )}
           <LabelsOnMyPost post={post} />
           <PostContent