diff --git a/package.json b/package.json index 47f1d43f..7dea8757 100644 --- a/package.json +++ b/package.json @@ -39,10 +39,10 @@ "@react-navigation/stack": "^6.3.10", "@sentry/react-native": "4.12.0", "@sharcoux/slider": "^6.1.1", - "@tanstack/react-query": "^4.20.4", + "@tanstack/react-query": "^4.20.9", "axios": "^1.2.2", "diff": "^5.1.0", - "expo": "^47.0.10", + "expo": "^47.0.11", "expo-auth-session": "^3.8.0", "expo-av": "^13.1.0", "expo-constants": "^14.1.0", @@ -93,7 +93,7 @@ "zeego": "^1.0.2" }, "devDependencies": { - "@babel/core": "^7.20.7", + "@babel/core": "^7.20.12", "@babel/plugin-proposal-optional-chaining": "^7.20.7", "@babel/preset-typescript": "^7.18.6", "@expo/config": "^7.0.3", diff --git a/src/components/contextMenu/at.ts b/src/components/contextMenu/at.ts index a94a8258..2682ee02 100644 --- a/src/components/contextMenu/at.ts +++ b/src/components/contextMenu/at.ts @@ -1,11 +1,12 @@ import { useNavigation } from '@react-navigation/native' import { NativeStackNavigationProp } from '@react-navigation/native-stack' -import { RootStackParamList } from '@utils/navigation/navigators' +import { RootStackParamList, useNavState } from '@utils/navigation/navigators' import { useTranslation } from 'react-i18next' const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu[][] => { const { t } = useTranslation('componentContextMenu') const navigation = useNavigation>() + const navigationState = useNavState() const menus: ContextMenu[][] = [] @@ -17,7 +18,8 @@ const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu[][] => navigation.navigate('Screen-Compose', { type: 'conversation', accts: [account.acct], - visibility: 'direct' + visibility: 'direct', + navigationState }), disabled: false, destructive: false, @@ -33,7 +35,8 @@ const menuAt = ({ account }: { account: Mastodon.Account }): ContextMenu[][] => navigation.navigate('Screen-Compose', { type: 'conversation', accts: [account.acct], - visibility: 'public' + visibility: 'public', + navigationState }), disabled: false, destructive: false, diff --git a/src/screens/Compose/index.tsx b/src/screens/Compose/index.tsx index 33a22249..5c6e6f10 100644 --- a/src/screens/Compose/index.tsx +++ b/src/screens/Compose/index.tsx @@ -7,7 +7,7 @@ import ComposeRoot from '@screens/Compose/Root' import { formatText } from '@screens/Compose/utils/processText' import { useQueryClient } from '@tanstack/react-query' import { handleError } from '@utils/api/helpers' -import { RootStackScreenProps } from '@utils/navigation/navigators' +import { RootStackScreenProps, useNavState } from '@utils/navigation/navigators' import { useInstanceQuery } from '@utils/queryHooks/instance' import { usePreferencesQuery } from '@utils/queryHooks/preferences' import { searchLocalStatus } from '@utils/queryHooks/search' @@ -347,13 +347,19 @@ const ScreenCompose: React.FC> = ({ switch (params?.type) { case undefined: - case 'conversation': queryClient.invalidateQueries({ queryKey: ['Timeline', { page: 'Following' }], exact: false }) break + case 'conversation': case 'edit': // doesn't work + // mutateTimeline.mutate({ + // type: 'editItem', + // status: res, + // navigationState: params.navigationState + // }) + // break case 'deleteEdit': case 'reply': for (const navState of params.navigationState) { diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index 3630781e..13e604c1 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -8,6 +8,7 @@ import apiGeneral from '@utils/api/general' import apiInstance from '@utils/api/instance' import { urlMatcher } from '@utils/helpers/urlMatcher' import { TabSharedStackScreenProps } from '@utils/navigation/navigators' +import { queryClient } from '@utils/queryHooks' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { getAccountStorage } from '@utils/storage/actions' import { StyleConstants } from '@utils/styles/constants' @@ -65,18 +66,15 @@ const TabSharedToot: React.FC> = ({ ), headerLeft: () => navigation.goBack()} /> }) - navigation.setParams({ toot, queryKey: toot._remote ? queryKey.remote : queryKey.local }) + navigation.setParams({ toot, queryKey: queryKey.local }) }, [hasRemoteContent]) const flRef = useRef(null) const scrolled = useRef(false) const match = urlMatcher(toot.url || toot.uri) - const finalData = useRef<(Mastodon.Status & { key?: string })[]>([ - { ...toot, _level: 0, key: 'cached' } - ]) const highlightIndex = useRef(0) - const queryLocal = useQuery( + const query = useQuery<{ pages: { body: (Mastodon.Status & { _key?: 'cached' })[] }[] }>( queryKey.local, async () => { const context = await apiInstance<{ @@ -85,30 +83,30 @@ const TabSharedToot: React.FC> = ({ }>({ method: 'get', url: `statuses/${toot.id}/context` - }) + }).then(res => res.body) - const statuses: (Mastodon.Status & { _level?: number })[] = [ - ...context.body.ancestors, - { ...toot }, - ...context.body.descendants - ] + highlightIndex.current = context.ancestors.length - const highlight = context.body.ancestors.length - highlightIndex.current = highlight + const statuses = [...context.ancestors, { ...toot }, ...context.descendants] - for (const [index, status] of statuses.entries()) { - if (index < highlight || status.id === toot.id) { - statuses[index]._level = 0 - continue - } - - const repliedLevel = statuses.find(s => s.id === status.in_reply_to_id)?._level - statuses[index]._level = (repliedLevel || 0) + 1 + return { + pages: [ + { + body: statuses.map((status, index) => { + if (index < highlightIndex.current || status.id === toot.id) { + return { ...status, _level: 0 } + } else { + const repliedLevel: number = + statuses.find(s => s.id === status.in_reply_to_id)?._level || 0 + return { ...status, _level: repliedLevel + 1 } + } + }) + } + ] } - - return { pages: [{ body: statuses }] } }, { + initialData: { pages: [{ body: [{ ...toot, _level: 0, _key: 'cached' }] }] }, enabled: !toot._remote, staleTime: 0, refetchOnMount: true, @@ -118,33 +116,29 @@ const TabSharedToot: React.FC> = ({ return } - if (finalData.current[0].key === 'cached') { - finalData.current = data.pages[0].body - - if (!scrolled.current) { - scrolled.current = true - const pointer = data.pages[0].body.findIndex(({ id }) => id === toot.id) - if (pointer < 1) return - const length = flRef.current?.props.data?.length - if (!length) return - try { - setTimeout(() => { - try { - flRef.current?.scrollToIndex({ - index: pointer, - viewOffset: 100 - }) - } catch {} - }, 500) - } catch (error) { - return - } + if (!scrolled.current) { + scrolled.current = true + const pointer = data.pages[0].body.findIndex(({ id }) => id === toot.id) + if (pointer < 1) return + const length = flRef.current?.props.data?.length + if (!length) return + try { + setTimeout(() => { + try { + flRef.current?.scrollToIndex({ + index: pointer, + viewOffset: 100 + }) + } catch {} + }, 500) + } catch (error) { + return } } } } ) - useQuery( + useQuery( queryKey.remote, async () => { const domain = match?.domain @@ -165,30 +159,22 @@ const TabSharedToot: React.FC> = ({ url: `api/v1/statuses/${id}/context` }).then(res => res.body) - if (!context) { - return Promise.reject('Cannot retrieve remote context') + if (!context?.ancestors.length && !context?.descendants.length) { + return Promise.resolve([]) } - const statuses: (Mastodon.Status & { _level?: number })[] = [ - ...context.ancestors, - { ...toot }, - ...context.descendants - ] + highlightIndex.current = context.ancestors.length - const highlight = context.ancestors.length - highlightIndex.current = highlight + const statuses = [...context.ancestors, { ...toot }, ...context.descendants] - for (const [index, status] of statuses.entries()) { - if (index < highlight || status.id === toot.id) { - statuses[index]._level = 0 - continue + return statuses.map((status, index) => { + if (index < highlightIndex.current || status.id === toot.id) { + return { ...status, _level: 0 } } - const repliedLevel = statuses.find(s => s.id === status.in_reply_to_id)?._level - statuses[index]._level = (repliedLevel || 0) + 1 - } - - return { pages: [{ body: statuses }] } + const repliedLevel: number = statuses.find(s => s.id === status.in_reply_to_id)?._level || 0 + return { ...status, _level: repliedLevel + 1 } + }) }, { enabled: @@ -197,39 +183,57 @@ const TabSharedToot: React.FC> = ({ staleTime: 0, refetchOnMount: true, onSuccess: data => { - if (finalData.current.length < 1 && data.pages[0].body.length < 1) { + if (query.data.pages[0].body.length < 1 && data.length < 1) { navigation.goBack() return } - if (finalData.current.length < data.pages[0].body.length) { - finalData.current = data.pages[0].body.map(remote => { - const localMatch = finalData.current.find(local => local.uri === remote.uri) - if (localMatch) { - delete localMatch.key - return localMatch - } else { - remote._remote = true + if (query.data.pages[0].body.length < data.length) { + queryClient.cancelQueries(queryKey.local) + queryClient.setQueryData<{ + pages: { body: Mastodon.Status[] }[] + }>(queryKey.local, old => { + if (!old) return old - remote.account._remote = true - remote.mentions = remote.mentions.map(mention => ({ ...mention, _remote: true })) - if (remote.reblog) { - remote.reblog.account._remote = true - remote.reblog.mentions = remote.mentions.map(mention => ({ - ...mention, - _remote: true - })) - } - - return remote + setHasRemoteContent(true) + return { + pages: [ + { + body: data.map(remote => { + const localMatch = query.data.pages[0].body.find( + local => local.uri === remote.uri + ) + if (localMatch) { + delete localMatch._key + return localMatch + } else { + return { + ...remote, + _remote: true, + account: { ...remote.account, _remote: true }, + mentions: remote.mentions.map(mention => ({ ...mention, _remote: true })), + ...(remote.reblog && { + reblog: { + ...remote.reblog, + _remote: true, + account: { ...remote.reblog.account, _remote: true }, + mentions: remote.reblog.mentions.map(mention => ({ + ...mention, + _remote: true + })) + } + }) + } + } + }) + } + ] } }) - - setHasRemoteContent(true) } scrolled.current = true - const pointer = data.pages[0].body.findIndex(({ id }) => id === toot.id) + const pointer = data.findIndex(({ id }) => id === toot.id) if (pointer < 1) return const length = flRef.current?.props.data?.length if (!length) return @@ -258,11 +262,11 @@ const TabSharedToot: React.FC> = ({ ref={flRef} scrollEventThrottle={16} windowSize={7} - data={finalData.current} + data={query.data.pages?.[0].body} renderItem={({ item, index }) => { - const prev = finalData.current[index - 1]?._level || 0 + const prev = query.data.pages[0].body[index - 1]?._level || 0 const curr = item._level - const next = finalData.current[index + 1]?._level || 0 + const next = query.data.pages[0].body[index + 1]?._level || 0 return ( > = ({ const offset = error.averageItemLength * error.index flRef.current?.scrollToOffset({ offset }) try { - error.index < finalData.current.length && + error.index < query.data.pages[0].body.length && setTimeout( () => flRef.current?.scrollToIndex({ @@ -436,7 +440,7 @@ const TabSharedToot: React.FC> = ({ marginHorizontal: StyleConstants.Spacing.M }} > - {queryLocal.isFetching ? ( + {query.isFetching ? ( ) : null} diff --git a/src/utils/navigation/navigators.ts b/src/utils/navigation/navigators.ts index 6db71913..132cd046 100644 --- a/src/utils/navigation/navigators.ts +++ b/src/utils/navigation/navigators.ts @@ -41,6 +41,7 @@ export type RootStackParamList = { accts: Mastodon.Account['acct'][] visibility: ComposeState['visibility'] text?: string // For contacting tooot only + navigationState: (QueryKeyTimeline | undefined)[] } | { type: 'share' diff --git a/src/utils/queryHooks/timeline.ts b/src/utils/queryHooks/timeline.ts index d313d423..ba38c591 100644 --- a/src/utils/queryHooks/timeline.ts +++ b/src/utils/queryHooks/timeline.ts @@ -16,6 +16,7 @@ import { AxiosError } from 'axios' import { uniqBy } from 'lodash' import { searchLocalStatus } from './search' import deleteItem from './timeline/deleteItem' +import editItem from './timeline/editItem' import updateStatusProperty from './timeline/updateStatusProperty' export type QueryKeyTimeline = [ @@ -284,8 +285,13 @@ export type MutationVarsTimelineUpdateAccountProperty = { } } +export type MutationVarsTimelineEditItem = { + type: 'editItem' + status: Mastodon.Status + navigationState: (QueryKeyTimeline | undefined)[] +} + export type MutationVarsTimelineDeleteItem = { - // This is for deleting status and conversation type: 'deleteItem' source: 'statuses' | 'conversations' id: Mastodon.Status['id'] @@ -300,6 +306,7 @@ export type MutationVarsTimelineDomainBlock = { export type MutationVarsTimeline = | MutationVarsTimelineUpdateStatusProperty | MutationVarsTimelineUpdateAccountProperty + | MutationVarsTimelineEditItem | MutationVarsTimelineDeleteItem | MutationVarsTimelineDomainBlock @@ -365,6 +372,8 @@ const mutationFunction = async (params: MutationVarsTimeline) => { } }) } + case 'editItem': + return { body: params.status } case 'deleteItem': return apiInstance({ method: 'delete', @@ -418,6 +427,10 @@ const useTimelineMutation = ({ case 'updateStatusProperty': updateStatusProperty(params, navigationState) break + case 'editItem': + console.log('YES!!!') + editItem(params) + break case 'deleteItem': deleteItem(params, navigationState) break diff --git a/src/utils/queryHooks/timeline/deleteItem.ts b/src/utils/queryHooks/timeline/deleteItem.ts index e872ce3d..fcd41be2 100644 --- a/src/utils/queryHooks/timeline/deleteItem.ts +++ b/src/utils/queryHooks/timeline/deleteItem.ts @@ -10,20 +10,17 @@ const deleteItem = ( if (!key) continue queryClient.setQueryData | undefined>(key, old => { - if (old) { - let foundToot: boolean = false - old.pages = old.pages.map(page => { - if (foundToot) return page + if (!old) return old - page.body = (page.body as Mastodon.Status[]).filter( - (item: Mastodon.Status) => item.id !== id + return { + ...old, + pages: old.pages.map(page => ({ + ...page, + body: (page.body as Mastodon.Status[]).filter( + status => status.id !== id && status.reblog?.id !== id ) - - return page - }) + })) } - - return old }) } } diff --git a/src/utils/queryHooks/timeline/editItem.ts b/src/utils/queryHooks/timeline/editItem.ts new file mode 100644 index 00000000..ecac3bac --- /dev/null +++ b/src/utils/queryHooks/timeline/editItem.ts @@ -0,0 +1,46 @@ +import { InfiniteData } from '@tanstack/react-query' +import { queryClient } from '@utils/queryHooks' +import { MutationVarsTimelineEditItem, TimelineData } from '../timeline' + +const editItem = ({ status, navigationState }: MutationVarsTimelineEditItem) => { + for (const key of navigationState) { + if (!key) continue + + queryClient.setQueryData>(key, old => { + if (!old) return old + + let updated: boolean = false + return { + ...old, + pages: old.pages.map(page => { + if (updated) return page + + if (typeof (page.body as Mastodon.Notification[])[0].type === 'string') { + ;(page.body as Mastodon.Notification[]).forEach(no => { + if (no.status?.reblog?.id === status.id) { + updated = true + no.status.reblog = { ...status } + } else if (no.status?.id === status.id) { + updated = true + no.status = { ...status } + } + }) + } else { + ;(page.body as Mastodon.Status[]).forEach(toot => { + if (toot.reblog?.id === status.id) { + updated = true + toot.reblog = { ...status } + } else if (toot.id === status.id) { + updated = true + toot = { ...status } + } + }) + } + return page + }) + } + }) + } +} + +export default editItem diff --git a/src/utils/queryHooks/timeline/updateStatusProperty.ts b/src/utils/queryHooks/timeline/updateStatusProperty.ts index ee096549..51c152ab 100644 --- a/src/utils/queryHooks/timeline/updateStatusProperty.ts +++ b/src/utils/queryHooks/timeline/updateStatusProperty.ts @@ -39,10 +39,13 @@ const updateStatusProperty = ( for (const key of navigationState) { if (!key) continue - queryClient.setQueryData | undefined>(key, old => { - if (old) { - let updated: boolean = false - old.pages = old.pages.map(page => { + queryClient.setQueryData>(key, old => { + if (!old) return old + + let updated: boolean = false + return { + ...old, + pages: old.pages.map(page => { if (updated) return page if (typeof (page.body as Mastodon.Conversation[])[0].unread === 'boolean') { @@ -73,7 +76,6 @@ const updateStatusProperty = ( return page }) } - return old }) } } diff --git a/src/utils/queryHooks/utils.ts b/src/utils/queryHooks/utils.ts index a4455f9f..ad06ff9e 100644 --- a/src/utils/queryHooks/utils.ts +++ b/src/utils/queryHooks/utils.ts @@ -9,4 +9,4 @@ export const infinitePageParams = { } export const flattenPages = (data: InfiniteData> | undefined): T[] | [] => - data?.pages.map(page => page.body).flat() || [] + data?.pages.flatMap(page => page.body) || [] diff --git a/yarn.lock b/yarn.lock index 67e094aa..4925bcac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -40,7 +40,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.20.7": +"@babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0": version: 7.20.7 resolution: "@babel/core@npm:7.20.7" dependencies: @@ -63,6 +63,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.20.12": + version: 7.20.12 + resolution: "@babel/core@npm:7.20.12" + dependencies: + "@ampproject/remapping": ^2.1.0 + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-compilation-targets": ^7.20.7 + "@babel/helper-module-transforms": ^7.20.11 + "@babel/helpers": ^7.20.7 + "@babel/parser": ^7.20.7 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.12 + "@babel/types": ^7.20.7 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.2 + semver: ^6.3.0 + checksum: 62e6c3e2149a70b5c9729ef5f0d3e2e97e9dcde89fc039c8d8e3463d5d7ba9b29ee84d10faf79b61532ac1645aa62f2bd42338320617e6e3a8a4d8e2a27076e7 + languageName: node + linkType: hard + "@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.20.7": version: 7.20.7 resolution: "@babel/generator@npm:7.20.7" @@ -222,6 +245,22 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.20.11": + version: 7.20.11 + resolution: "@babel/helper-module-transforms@npm:7.20.11" + dependencies: + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-simple-access": ^7.20.2 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/helper-validator-identifier": ^7.19.1 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.10 + "@babel/types": ^7.20.7 + checksum: 29319ebafa693d48756c6ba0d871677bb0037e0da084fbe221a17c38d57093fc8aa38543c07d76e788266a937976e37ab4901971ca7f237c5ab45f524b9ecca0 + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -1475,6 +1514,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12": + version: 7.20.12 + resolution: "@babel/traverse@npm:7.20.12" + dependencies: + "@babel/code-frame": ^7.18.6 + "@babel/generator": ^7.20.7 + "@babel/helper-environment-visitor": ^7.18.9 + "@babel/helper-function-name": ^7.19.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: d758b355ab4f1e87984524b67785fa23d74e8a45d2ceb8bcf4d5b2b0cd15ee160db5e68c7078808542805774ca3802e2eafb1b9638afa4cd7f9ecabd0ca7fd56 + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": version: 7.20.7 resolution: "@babel/types@npm:7.20.7" @@ -1518,15 +1575,15 @@ __metadata: languageName: node linkType: hard -"@expo/cli@npm:0.4.10": - version: 0.4.10 - resolution: "@expo/cli@npm:0.4.10" +"@expo/cli@npm:0.4.11": + version: 0.4.11 + resolution: "@expo/cli@npm:0.4.11" dependencies: "@babel/runtime": ^7.14.0 "@expo/code-signing-certificates": 0.0.5 "@expo/config": ~7.0.2 "@expo/config-plugins": ~5.0.3 - "@expo/dev-server": 0.1.123 + "@expo/dev-server": 0.1.124 "@expo/devcert": ^1.0.0 "@expo/json-file": ^8.2.35 "@expo/metro-config": ~0.5.0 @@ -1585,7 +1642,7 @@ __metadata: wrap-ansi: ^7.0.0 bin: expo-internal: build/bin/cli - checksum: e01658746d04f08f88bca522b18072959f0ef55cc332e6251499de51dfa98e9081e0b70318601a57b8a7a88c16aceaadc116718d8e3049b40668b031f78577d6 + checksum: 6623f9a77444b8dffe3a73a5bb8a6ef21da1da0c0e5d60a3fd4c67545dd82bd915e22b0f7db39066e67befe3f6689dfe73f41c11d1723dbd9c19cac7a48dfaa7 languageName: node linkType: hard @@ -1667,15 +1724,15 @@ __metadata: languageName: node linkType: hard -"@expo/dev-server@npm:0.1.123": - version: 0.1.123 - resolution: "@expo/dev-server@npm:0.1.123" +"@expo/dev-server@npm:0.1.124": + version: 0.1.124 + resolution: "@expo/dev-server@npm:0.1.124" dependencies: "@expo/bunyan": 4.0.0 "@expo/metro-config": ~0.5.1 "@expo/osascript": 2.0.33 "@expo/spawn-async": ^1.5.0 - body-parser: 1.19.0 + body-parser: ^1.20.1 chalk: ^4.0.0 connect: ^3.7.0 fs-extra: 9.0.0 @@ -1687,7 +1744,7 @@ __metadata: semver: 7.3.2 serialize-error: 6.0.0 temp-dir: ^2.0.0 - checksum: 55e158f192435d8779d3b6e8b56b0b15586f9ae7775a98d3edb03bae28fe82d37e2b1aa3c1972c672b15a5baf2787066bab378352b1f8314051bfdf383077b6c + checksum: ebb632a3f2f1605976255d22388943249757a15533831fbd08ee0b4e4c7b96d8553f74ae05fa414c4e67a01840ee2217866f40bc86947f4a0098c7750acd1f31 languageName: node linkType: hard @@ -3275,18 +3332,18 @@ __metadata: languageName: node linkType: hard -"@tanstack/query-core@npm:4.20.4": - version: 4.20.4 - resolution: "@tanstack/query-core@npm:4.20.4" - checksum: bdb652296e4093d8cb042a67b9c035bc0a756e09a3b12aeb070068b07adc1c71174c2e6108f2a8c3322a26cb73ba57f431326aa0b813c81621674b9cc208cd93 +"@tanstack/query-core@npm:4.20.9": + version: 4.20.9 + resolution: "@tanstack/query-core@npm:4.20.9" + checksum: 679551353e6d5adcae771bc78b64959a6ecf4f85c1f74952b38b18a7425374cf84dc2e461cf6048be206d8bbac265468d36231f7f9d0b6689504a0e069dd5ac6 languageName: node linkType: hard -"@tanstack/react-query@npm:^4.20.4": - version: 4.20.4 - resolution: "@tanstack/react-query@npm:4.20.4" +"@tanstack/react-query@npm:^4.20.9": + version: 4.20.9 + resolution: "@tanstack/react-query@npm:4.20.9" dependencies: - "@tanstack/query-core": 4.20.4 + "@tanstack/query-core": 4.20.9 use-sync-external-store: ^1.2.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -3297,7 +3354,7 @@ __metadata: optional: true react-native: optional: true - checksum: ba9e2f175c58bde592c0ad14285f289585474763f8d68072d651fa75263a3a7f75eead5b62aa3140db133b95468498bc58817d07513f6f857be2bd8031b491da + checksum: 4fc953d774c5c0f7f332f014dfb2fb9865387ae6e849fdf551e2ad70f07d55fbdbc4c6afb27a1f90bce3a2348bd1adf67ab78a4bc2cdf8d3e5ff90128730b467 languageName: node linkType: hard @@ -4109,21 +4166,23 @@ __metadata: languageName: node linkType: hard -"body-parser@npm:1.19.0": - version: 1.19.0 - resolution: "body-parser@npm:1.19.0" +"body-parser@npm:^1.20.1": + version: 1.20.1 + resolution: "body-parser@npm:1.20.1" dependencies: - bytes: 3.1.0 + bytes: 3.1.2 content-type: ~1.0.4 debug: 2.6.9 - depd: ~1.1.2 - http-errors: 1.7.2 + depd: 2.0.0 + destroy: 1.2.0 + http-errors: 2.0.0 iconv-lite: 0.4.24 - on-finished: ~2.3.0 - qs: 6.7.0 - raw-body: 2.4.0 - type-is: ~1.6.17 - checksum: 490231b4c89bbd43112762f7ba8e5342c174a6c9f64284a3b0fcabf63277e332f8316765596f1e5b15e4f3a6cf0422e005f4bb3149ed3a224bb025b7a36b9ac1 + on-finished: 2.4.1 + qs: 6.11.0 + raw-body: 2.5.1 + type-is: ~1.6.18 + unpipe: 1.0.0 + checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266 languageName: node linkType: hard @@ -4285,10 +4344,10 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.0": - version: 3.1.0 - resolution: "bytes@npm:3.1.0" - checksum: 7c3b21c5d9d44ed455460d5d36a31abc6fa2ce3807964ba60a4b03fd44454c8cf07bb0585af83bfde1c5cc2ea4bbe5897bc3d18cd15e0acf25a3615a35aba2df +"bytes@npm:3.1.2": + version: 3.1.2 + resolution: "bytes@npm:3.1.2" + checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e languageName: node linkType: hard @@ -5135,7 +5194,7 @@ __metadata: languageName: node linkType: hard -"depd@npm:^1.1.2, depd@npm:~1.1.2": +"depd@npm:^1.1.2": version: 1.1.2 resolution: "depd@npm:1.1.2" checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9 @@ -5732,12 +5791,12 @@ __metadata: languageName: node linkType: hard -"expo@npm:^47.0.10": - version: 47.0.10 - resolution: "expo@npm:47.0.10" +"expo@npm:^47.0.11": + version: 47.0.11 + resolution: "expo@npm:47.0.11" dependencies: "@babel/runtime": ^7.14.0 - "@expo/cli": 0.4.10 + "@expo/cli": 0.4.11 "@expo/config": 7.0.3 "@expo/config-plugins": 5.0.4 "@expo/vector-icons": ^13.0.0 @@ -5764,7 +5823,7 @@ __metadata: optional: true bin: expo: bin/cli.js - checksum: 6bde0837544b83941588e53fcfab35a3ca6bdb49695f71d923158dd1145d627fc9f312e64cf1c8bf0ad7a5083652fd352a490e2994d85b2ad384744dddcd19bf + checksum: 5e470d7b0c94ddade3f77e4e5038f025635f432f1e56a9e541455f5e71b5f4919c7c756639b5bf31ff6b877ad254a77290efe0305d48712e5406c76f3c8b7e77 languageName: node linkType: hard @@ -6558,19 +6617,6 @@ __metadata: languageName: node linkType: hard -"http-errors@npm:1.7.2": - version: 1.7.2 - resolution: "http-errors@npm:1.7.2" - dependencies: - depd: ~1.1.2 - inherits: 2.0.3 - setprototypeof: 1.1.1 - statuses: ">= 1.5.0 < 2" - toidentifier: 1.0.0 - checksum: 5534b0ae08e77f5a45a2380f500e781f6580c4ff75b816cb1f09f99a290b57e78a518be6d866db1b48cca6b052c09da2c75fc91fb16a2fe3da3c44d9acbb9972 - languageName: node - linkType: hard - "http-errors@npm:2.0.0": version: 2.0.0 resolution: "http-errors@npm:2.0.0" @@ -6719,13 +6765,6 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2.0.3": - version: 2.0.3 - resolution: "inherits@npm:2.0.3" - checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0 - languageName: node - linkType: hard - "ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" @@ -7438,6 +7477,15 @@ __metadata: languageName: node linkType: hard +"json5@npm:^2.2.2": + version: 2.2.3 + resolution: "json5@npm:2.2.3" + bin: + json5: lib/cli.js + checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 + languageName: node + linkType: hard + "jsonfile@npm:^2.1.0": version: 2.4.0 resolution: "jsonfile@npm:2.4.0" @@ -9240,10 +9288,12 @@ __metadata: languageName: node linkType: hard -"qs@npm:6.7.0": - version: 6.7.0 - resolution: "qs@npm:6.7.0" - checksum: dfd5f6adef50e36e908cfa70a6233871b5afe66fbaca37ecc1da352ba29eb2151a3797991948f158bb37fccde51bd57845cb619a8035287bfc24e4591172c347 +"qs@npm:6.11.0, qs@npm:^6.9.1": + version: 6.11.0 + resolution: "qs@npm:6.11.0" + dependencies: + side-channel: ^1.0.4 + checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 languageName: node linkType: hard @@ -9254,15 +9304,6 @@ __metadata: languageName: node linkType: hard -"qs@npm:^6.9.1": - version: 6.11.0 - resolution: "qs@npm:6.11.0" - dependencies: - side-channel: ^1.0.4 - checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297 - languageName: node - linkType: hard - "query-string@npm:^5.0.1": version: 5.1.1 resolution: "query-string@npm:5.1.1" @@ -9318,15 +9359,15 @@ __metadata: languageName: node linkType: hard -"raw-body@npm:2.4.0": - version: 2.4.0 - resolution: "raw-body@npm:2.4.0" +"raw-body@npm:2.5.1": + version: 2.5.1 + resolution: "raw-body@npm:2.5.1" dependencies: - bytes: 3.1.0 - http-errors: 1.7.2 + bytes: 3.1.2 + http-errors: 2.0.0 iconv-lite: 0.4.24 unpipe: 1.0.0 - checksum: 6343906939e018c6e633a34a938a5d6d1e93ffcfa48646e00207d53b418e941953b521473950c079347220944dc75ba10e7b3c08bf97e3ac72c7624882db09bb + checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e languageName: node linkType: hard @@ -10439,13 +10480,6 @@ __metadata: languageName: node linkType: hard -"setprototypeof@npm:1.1.1": - version: 1.1.1 - resolution: "setprototypeof@npm:1.1.1" - checksum: a8bee29c1c64c245d460ce53f7460af8cbd0aceac68d66e5215153992cc8b3a7a123416353e0c642060e85cc5fd4241c92d1190eec97eda0dcb97436e8fcca3b - languageName: node - linkType: hard - "setprototypeof@npm:1.2.0": version: 1.2.0 resolution: "setprototypeof@npm:1.2.0" @@ -10778,7 +10812,7 @@ __metadata: languageName: node linkType: hard -"statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0": +"statuses@npm:~1.5.0": version: 1.5.0 resolution: "statuses@npm:1.5.0" checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c @@ -11195,13 +11229,6 @@ __metadata: languageName: node linkType: hard -"toidentifier@npm:1.0.0": - version: 1.0.0 - resolution: "toidentifier@npm:1.0.0" - checksum: 199e6bfca1531d49b3506cff02353d53ec987c9ee10ee272ca6484ed97f1fc10fb77c6c009079ca16d5c5be4a10378178c3cacdb41ce9ec954c3297c74c6053e - languageName: node - linkType: hard - "toidentifier@npm:1.0.1": version: 1.0.1 resolution: "toidentifier@npm:1.0.1" @@ -11213,7 +11240,7 @@ __metadata: version: 0.0.0-use.local resolution: "tooot@workspace:." dependencies: - "@babel/core": ^7.20.7 + "@babel/core": ^7.20.12 "@babel/plugin-proposal-optional-chaining": ^7.20.7 "@babel/preset-typescript": ^7.18.6 "@expo/config": ^7.0.3 @@ -11239,7 +11266,7 @@ __metadata: "@react-navigation/stack": ^6.3.10 "@sentry/react-native": 4.12.0 "@sharcoux/slider": ^6.1.1 - "@tanstack/react-query": ^4.20.4 + "@tanstack/react-query": ^4.20.9 "@types/diff": ^5.0.2 "@types/linkify-it": ^3.0.2 "@types/lodash": ^4.14.191 @@ -11254,7 +11281,7 @@ __metadata: chalk: ^4.1.2 diff: ^5.1.0 dotenv: ^16.0.3 - expo: ^47.0.10 + expo: ^47.0.11 expo-auth-session: ^3.8.0 expo-av: ^13.1.0 expo-constants: ^14.1.0 @@ -11378,7 +11405,7 @@ __metadata: languageName: node linkType: hard -"type-is@npm:~1.6.17": +"type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" dependencies: