diff options
| author | Eric Bailey <git@esb.lol> | 2024-08-21 22:16:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-21 20:16:03 -0700 |
| commit | d5c78b9183ac78620f59538fed61c8130ae1c47a (patch) | |
| tree | 53ad7c63b9263e508df587aa6d837c4036f394e9 /src/view/com/post-thread | |
| parent | 61f0be705d614a31331945e1c4b9361d71b81403 (diff) | |
| download | voidsky-d5c78b9183ac78620f59538fed61c8130ae1c47a.tar.zst | |
Prep threadgate shadow hack (#4970)
Co-authored-by: Hailey <me@haileyok.com>
Diffstat (limited to 'src/view/com/post-thread')
| -rw-r--r-- | src/view/com/post-thread/PostThread.tsx | 9 | ||||
| -rw-r--r-- | src/view/com/post-thread/PostThreadItem.tsx | 32 |
2 files changed, 21 insertions, 20 deletions
diff --git a/src/view/com/post-thread/PostThread.tsx b/src/view/com/post-thread/PostThread.tsx index bd778fd98..3757d76c6 100644 --- a/src/view/com/post-thread/PostThread.tsx +++ b/src/view/com/post-thread/PostThread.tsx @@ -129,17 +129,18 @@ export function PostThread({uri}: {uri: string | undefined}) { currentAccount && rootPostUri && currentAccount?.did === new AtUri(rootPostUri).host + const initialThreadgateRecord = rootPost?.threadgate?.record as + | AppBskyFeedThreadgate.Record + | undefined const {data: threadgateRecord} = useThreadgateRecordQuery({ /** * If the user is the OP and the root post has a threadgate, we should load * the threadgate record. Otherwise, fallback to initialData, which is taken * from the response from `getPostThread`. */ - enabled: Boolean(isOP && rootPostUri), + enabled: Boolean(isOP && rootPostUri && initialThreadgateRecord), postUri: rootPostUri, - initialData: rootPost?.threadgate?.record as - | AppBskyFeedThreadgate.Record - | undefined, + initialData: initialThreadgateRecord, }) const moderationOpts = useModerationOpts() diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx index da187f5d9..f2cd8e85a 100644 --- a/src/view/com/post-thread/PostThreadItem.tsx +++ b/src/view/com/post-thread/PostThreadItem.tsx @@ -399,22 +399,6 @@ let PostThreadItemLoaded = ({ </Text> </Link> ) : null} - {post.likeCount != null && post.likeCount !== 0 ? ( - <Link - style={styles.expandedInfoItem} - href={likesHref} - title={likesTitle}> - <Text - testID="likeCount-expanded" - type="lg" - style={pal.textLight}> - <Text type="xl-bold" style={pal.text}> - {formatCount(post.likeCount)} - </Text>{' '} - <Plural value={post.likeCount} one="like" other="likes" /> - </Text> - </Link> - ) : null} {post.quoteCount != null && post.quoteCount !== 0 ? ( <Link style={styles.expandedInfoItem} @@ -435,6 +419,22 @@ let PostThreadItemLoaded = ({ </Text> </Link> ) : null} + {post.likeCount != null && post.likeCount !== 0 ? ( + <Link + style={styles.expandedInfoItem} + href={likesHref} + title={likesTitle}> + <Text + testID="likeCount-expanded" + type="lg" + style={pal.textLight}> + <Text type="xl-bold" style={pal.text}> + {formatCount(post.likeCount)} + </Text>{' '} + <Plural value={post.likeCount} one="like" other="likes" /> + </Text> + </Link> + ) : null} </View> ) : null} <View style={[s.pl10, s.pr10]}> |