Improve thread loading (#4402)
* Increase the number of posts loaded when a self-thread is present * Increase depth to 10, detect cutoffs on self-threads and show continue link * Stacky the avis
This commit is contained in:
parent
4b6609d48b
commit
46e12c6d34
3 changed files with 112 additions and 2 deletions
|
@ -41,6 +41,8 @@ export interface ThreadCtx {
|
|||
hasMore?: boolean
|
||||
isParentLoading?: boolean
|
||||
isChildLoading?: boolean
|
||||
isSelfThread?: boolean
|
||||
hasMoreSelfThread?: boolean
|
||||
}
|
||||
|
||||
export type ThreadPost = {
|
||||
|
@ -88,9 +90,12 @@ export function usePostThreadQuery(uri: string | undefined) {
|
|||
gcTime: 0,
|
||||
queryKey: RQKEY(uri || ''),
|
||||
async queryFn() {
|
||||
const res = await agent.getPostThread({uri: uri!})
|
||||
const res = await agent.getPostThread({uri: uri!, depth: 10})
|
||||
if (res.success) {
|
||||
return responseToThreadNodes(res.data.thread)
|
||||
const thread = responseToThreadNodes(res.data.thread)
|
||||
annotateSelfThread(thread)
|
||||
console.log(thread)
|
||||
return thread
|
||||
}
|
||||
return {type: 'unknown', uri: uri!}
|
||||
},
|
||||
|
@ -234,6 +239,8 @@ function responseToThreadNodes(
|
|||
isHighlightedPost: depth === 0,
|
||||
hasMore:
|
||||
direction === 'down' && !node.replies?.length && !!node.replyCount,
|
||||
isSelfThread: false, // populated `annotateSelfThread`
|
||||
hasMoreSelfThread: false, // populated in `annotateSelfThread`
|
||||
},
|
||||
}
|
||||
} else if (AppBskyFeedDefs.isBlockedPost(node)) {
|
||||
|
@ -245,6 +252,48 @@ function responseToThreadNodes(
|
|||
}
|
||||
}
|
||||
|
||||
function annotateSelfThread(thread: ThreadNode) {
|
||||
if (thread.type !== 'post') {
|
||||
return
|
||||
}
|
||||
const selfThreadNodes: ThreadPost[] = [thread]
|
||||
|
||||
let parent: ThreadNode | undefined = thread.parent
|
||||
while (parent) {
|
||||
if (
|
||||
parent.type !== 'post' ||
|
||||
parent.post.author.did !== thread.post.author.did
|
||||
) {
|
||||
// not a self-thread
|
||||
return
|
||||
}
|
||||
selfThreadNodes.push(parent)
|
||||
parent = parent.parent
|
||||
}
|
||||
|
||||
let node = thread
|
||||
for (let i = 0; i < 10; i++) {
|
||||
const reply = node.replies?.find(
|
||||
r => r.type === 'post' && r.post.author.did === thread.post.author.did,
|
||||
)
|
||||
if (reply?.type !== 'post') {
|
||||
break
|
||||
}
|
||||
selfThreadNodes.push(reply)
|
||||
node = reply
|
||||
}
|
||||
|
||||
if (selfThreadNodes.length > 1) {
|
||||
for (const selfThreadNode of selfThreadNodes) {
|
||||
selfThreadNode.ctx.isSelfThread = true
|
||||
}
|
||||
const last = selfThreadNodes.at(-1)
|
||||
if (last && last.post.replyCount && !last.replies?.length) {
|
||||
last.ctx.hasMoreSelfThread = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function findPostInQueryData(
|
||||
queryClient: QueryClient,
|
||||
uri: string,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue