octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into release

This commit is contained in:
xmflsct 2023-01-10 00:52:56 +01:00
parent 0a795e427d 1918274ec9
commit 54749ddc18
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/screens/Tabs/Shared/Toot.tsx
View File

@ -162,7 +162,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
}).then(res => res.body)
if (!context?.ancestors.length && !context?.descendants.length) {
return Promise.resolve([])
return Promise.resolve([{ ...toot }])
}
highlightIndex.current = context.ancestors.length
@ -193,12 +193,12 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
return
}
if ((query.data?.pages[0].body.length || 0) - 1 <= data.length) {
if ((query.data?.pages[0].body.length || 0) < data.length) {
queryClient.cancelQueries(queryKey.local)
queryClient.setQueryData<{
pages: { body: Mastodon.Status[] }[]
}>(queryKey.local, old => {
if (!old) return { pages: [{ body: [toot] }] }
if (!old) return old
setHasRemoteContent(true)
return {