octo/tooot
octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-04-03 21:21:01 +02:00
Code Issues Projects Releases Wiki Activity

Update counts with remote data

Browse Source
This commit is contained in:
xmflsct 2023-04-12 23:48:39 +02:00
parent 20152790f5
commit e74a73fbd7
2 changed files with 53 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,13 +123,19 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
} }
} }
const updateCounts = (
remote: Mastodon.Status
): Pick<Mastodon.Status, 'reblogs_count' | 'replies_count' | 'favourites_count'> => ({
reblogs_count: remote.reblogs_count,
replies_count: remote.replies_count,
favourites_count: remote.favourites_count
})
const match = urlMatcher(toot.url || toot.uri) const match = urlMatcher(toot.url || toot.uri)
const remoteQueryEnabled = const remoteQueryEnabled =
['public', 'unlisted'].includes(toot.visibility) && ['public', 'unlisted'].includes(toot.visibility) &&
match?.domain !== getAccountStorage.string('auth.domain') match?.domain !== getAccountStorage.string('auth.domain')
const query = useQuery<{ const query = useQuery<Mastodon.Status[]>(
pages: { body: (Mastodon.Status & { _level?: number })[] }[]
}>(
queryKey.local, queryKey.local,
async () => { async () => {
const context = await apiInstance<{ const context = await apiInstance<{
@ -143,30 +149,24 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
ancestorsCache.current = [...context.ancestors] ancestorsCache.current = [...context.ancestors]
const statuses = [{ ...toot }, ...context.descendants] const statuses = [{ ...toot }, ...context.descendants]
return { return statuses.map((status, index) => {
pages: [ if (index === 0) {
{ status._level = 0
body: statuses.map((status, index) => { return status
if (index === 0) { } else {
status._level = 0 const repliedLevel: number =
return status statuses.find(s => s.id === status.in_reply_to_id)?._level || 0
} else { status._level = repliedLevel + 1
const repliedLevel: number = return status
statuses.find(s => s.id === status.in_reply_to_id)?._level || 0 }
status._level = repliedLevel + 1 })
return status
}
})
}
]
}
}, },
{ {
enabled: !toot._remote, enabled: !toot._remote,
staleTime: 0, staleTime: 0,
refetchOnMount: true, refetchOnMount: true,
onSuccess: async data => { onSuccess: async data => {
if (data.pages[0].body.length < 1) { if (data.length < 1) {
navigation.goBack() navigation.goBack()
return return
} }
@ -189,17 +189,24 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
return Promise.reject('Cannot parse remote toot id') return Promise.reject('Cannot parse remote toot id')
} }
const context = await apiGeneral<{ const [remote, context] = await Promise.all([
ancestors: Mastodon.Status[] apiGeneral<Mastodon.Status>({
descendants: Mastodon.Status[] method: 'get',
}>({ domain,
method: 'get', url: `api/v1/statuses/${id}`
domain, }).then(res => res.body),
url: `api/v1/statuses/${id}/context` apiGeneral<{
}).then(res => res.body) ancestors: Mastodon.Status[]
descendants: Mastodon.Status[]
}>({
method: 'get',
domain,
url: `api/v1/statuses/${id}/context`
}).then(res => res.body)
])
if (!context?.ancestors.length && !context?.descendants.length) { if (!context?.ancestors.length && !context?.descendants.length) {
return Promise.resolve([{ ...toot }]) return Promise.resolve([{ ...toot, ...updateCounts(remote) }])
} }
if ((ancestorsCache.current?.length || 0) < context.ancestors.length) { if ((ancestorsCache.current?.length || 0) < context.ancestors.length) {
@ -213,7 +220,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
}) })
} }
const statuses = [{ ...toot }, ...context.descendants] const statuses = [{ ...toot, ...updateCounts(remote) }, ...context.descendants]
return statuses.map((status, index) => { return statuses.map((status, index) => {
if (index === 0) { if (index === 0) {
status._level = 0 status._level = 0
@ -232,34 +239,25 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
refetchOnMount: true, refetchOnMount: true,
retry: false, retry: false,
onSuccess: async data => { onSuccess: async data => {
if ((query.data?.pages[0].body.length || 0) < 1 && data.length < 1) { if ((query.data?.length || 0) < 1 && data.length < 1) {
navigation.goBack() navigation.goBack()
return return
} }
if ((query.data?.pages[0].body.length || 0) < data.length) { if ((query.data?.length || 0) < data.length) {
setHasRemoteContent(true) setHasRemoteContent(true)
queryClient.cancelQueries(queryKey.local) queryClient.cancelQueries(queryKey.local)
queryClient.setQueryData<{ pages: { body: Mastodon.Status[] }[] }>( queryClient.setQueryData<Mastodon.Status[]>(queryKey.local, old => {
queryKey.local, return data.map(remote => {
old => { const localMatch = old?.find(local => local.uri === remote.uri)
return { if (localMatch) {
pages: [ return { ...localMatch, _level: remote._level, ...updateCounts(remote) }
{ } else {
body: data.map(remote => { return appendRemote.status(remote, match!.domain)
const localMatch = old?.pages[0].body.find(local => local.uri === remote.uri)
if (localMatch) {
return { ...localMatch, _level: remote._level }
} else {
return appendRemote.status(remote, match!.domain)
}
})
}
]
} }
} })
) })
} }
}, },
onSettled: async () => { onSettled: async () => {
@ -275,12 +273,12 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
return ( return (
<FlatList <FlatList
ref={flRef} ref={flRef}
data={query.data?.pages?.[0].body} data={query.data}
keyExtractor={(item, index) => `${item.id}_${index}`} keyExtractor={(item, index) => `${item.id}_${index}`}
renderItem={({ item, index }) => { renderItem={({ item, index }) => {
const prev = query.data?.pages[0].body[index - 1]?._level || 0 const prev = query.data?.[index - 1]?._level || 0
const curr = item._level || 0 const curr = item._level || 0
const next = query.data?.pages[0].body[index + 1]?._level || 0 const next = query.data?.[index + 1]?._level || 0
const height = heights[index] || 300 const height = heights[index] || 300
let path = '' let path = ''

2
src/utils/queryHooks/neodb.ts
View File

@ -8,7 +8,7 @@ const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeyNeodb>)
apiGeneral({ apiGeneral({
method: 'get', method: 'get',
domain: 'neodb.social', domain: 'neodb.social',
url: `/api/${queryKey[1].path}` url: `api/${queryKey[1].path}`
}).then(res => res.body) }).then(res => res.body)
export const useNeodbQuery = ( export const useNeodbQuery = (