octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into candidate

Browse Source
This commit is contained in:
xmflsct
2023-01-15 20:34:50 +01:00
parent 91aafbfaeb f10d52cebc
commit 8638f5178f
29 changed files with 320 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -1,6 +1,6 @@
{
"name": "tooot",
"version": "4.8.2",
"version": "4.8.3",
"description": "tooot for Mastodon",
"author": "xmflsct <me@xmflsct.com>",
"license": "GPL-3.0-or-later",
@ -70,7 +70,6 @@
"react-i18next": "^12.1.4",
"react-intl": "^6.2.5",
"react-native": "^0.70.6",
"react-native-animated-spinkit": "^1.5.2",
"react-native-blurhash": "^1.1.10",
"react-native-fast-image": "^8.6.3",
"react-native-feather": "^1.1.2",

2
src/App.tsx
View File

@ -10,7 +10,6 @@ import log from '@utils/startup/log'
import netInfo from '@utils/startup/netInfo'
import push from '@utils/startup/push'
import sentry from '@utils/startup/sentry'
import timezone from '@utils/startup/timezone'
import { storage } from '@utils/storage'
import {
getGlobalStorage,
@ -39,7 +38,6 @@ dev()
sentry()
audio()
push()
timezone()
enableFreeze(true)
log('log', 'App', 'delay splash')

4
src/components/Button.tsx
View File

@ -3,7 +3,7 @@ import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React, { useState } from 'react'
import { AccessibilityProps, Pressable, StyleProp, View, ViewStyle } from 'react-native'
import { Flow } from 'react-native-animated-spinkit'
import { Loading } from './Loading'
import CustomText from './Text'
export interface Props {
@ -53,7 +53,7 @@ const Button: React.FC<Props> = ({
const loadingSpinkit = () =>
loading ? (
<View style={{ position: 'absolute' }}>
<Flow size={StyleConstants.Font.Size[size]} color={colors.secondary} />
<Loading />
</View>
) : null

4
src/components/Header/Right.tsx
View File

@ -1,10 +1,10 @@
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import CustomText from '@components/Text'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { AccessibilityProps, Pressable, View } from 'react-native'
import { Flow } from 'react-native-animated-spinkit'
export interface Props {
accessibilityLabel?: string
@ -43,7 +43,7 @@ const HeaderRight: React.FC<Props> = ({
const loadingSpinkit = () =>
loading ? (
<View style={{ position: 'absolute' }}>
<Flow size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
<Loading />
</View>
) : null

12
src/components/Loading.tsx Normal file
View File

@ -0,0 +1,12 @@
import { useTheme } from '@utils/styles/ThemeManager'
import { ActivityIndicator, ViewProps } from 'react-native'
export type Props = {
size?: 'small' | 'large'
} & ViewProps
export const Loading: React.FC<Props> = ({ size = 'small', ...rest }) => {
const { colors } = useTheme()
return <ActivityIndicator size={size} color={colors.secondary} {...rest} />
}

4
src/components/Menu/Row.tsx
View File

@ -1,4 +1,5 @@
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import CustomText from '@components/Text'
import { useAccessibility } from '@utils/accessibility/AccessibilityManager'
import { StyleConstants } from '@utils/styles/constants'
@ -6,7 +7,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
import { ColorDefinitions } from '@utils/styles/themes'
import React from 'react'
import { View } from 'react-native'
import { Flow } from 'react-native-animated-spinkit'
import { State, Switch, TapGestureHandler } from 'react-native-gesture-handler'
export interface Props {
@ -150,7 +150,7 @@ const MenuRow: React.FC<Props> = ({
) : null}
{loading ? (
<View style={{ position: 'absolute' }}>
<Flow size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
<Loading />
</View>
) : null}
</View>

6
src/components/Timeline/Default.tsx
View File

@ -36,6 +36,7 @@ export interface Props {
disableDetails?: boolean
disableOnPress?: boolean
isConversation?: boolean
noBackground?: boolean
}
// When the poll is long
@ -45,7 +46,8 @@ const TimelineDefault: React.FC<Props> = ({
highlighted = false,
disableDetails = false,
disableOnPress = false,
isConversation = false
isConversation = false,
noBackground = false
}) => {
const status = item.reblog ? item.reblog : item
const rawContent = useRef<string[]>([])
@ -77,7 +79,7 @@ const TimelineDefault: React.FC<Props> = ({
padding: disableDetails
? StyleConstants.Spacing.Global.PagePadding / 1.5
: StyleConstants.Spacing.Global.PagePadding,
backgroundColor: colors.backgroundDefault,
backgroundColor: noBackground ? undefined : colors.backgroundDefault,
paddingBottom: disableDetails ? StyleConstants.Spacing.Global.PagePadding / 1.5 : 0
}
const main = () => (

4
src/components/Timeline/Empty.tsx
View File

@ -1,5 +1,6 @@
import Button from '@components/Button'
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import CustomText from '@components/Text'
import { QueryKeyTimeline, useTimelineQuery } from '@utils/queryHooks/timeline'
import { StyleConstants } from '@utils/styles/constants'
@ -7,7 +8,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { useTranslation } from 'react-i18next'
import { View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
export interface Props {
queryKey: QueryKeyTimeline
@ -25,7 +25,7 @@ const TimelineEmpty: React.FC<Props> = ({ queryKey }) => {
const children = () => {
switch (status) {
case 'loading':
return <Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
return <Loading />
case 'error':
return (
<>

4
src/components/Timeline/Footer.tsx
View File

@ -1,4 +1,5 @@
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import CustomText from '@components/Text'
import { QueryKeyTimeline, useTimelineQuery } from '@utils/queryHooks/timeline'
import { StyleConstants } from '@utils/styles/constants'
@ -6,7 +7,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { Trans } from 'react-i18next'
import { View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
export interface Props {
queryKey: QueryKeyTimeline
@ -31,7 +31,7 @@ const TimelineFooter: React.FC<Props> = ({ queryKey, disableInfinity }) => {
}}
>
{!disableInfinity && hasNextPage ? (
<Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
<Loading />
) : (
<CustomText fontStyle='S' style={{ color: colors.secondary }}>
<Trans

3
src/components/Timeline/Shared/Card.tsx
View File

@ -64,6 +64,9 @@ const TimelineCard: React.FC = () => {
if (loading) {
return null
}
if (status.media_attachments.length) {
return null
}
if ((!status.card?.image || !status.card.title) && !status.card?.description) {
return null
}

10
src/components/Timeline/Shared/Translate.tsx
View File

@ -1,3 +1,4 @@
import { Loading } from '@components/Loading'
import { ParseHTML } from '@components/Parse'
import CustomText from '@components/Text'
import detectLanguage from '@utils/helpers/detectLanguage'
@ -9,7 +10,6 @@ import * as Localization from 'expo-localization'
import React, { useContext, useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Platform, Pressable } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import StatusContext from './Context'
const TimelineTranslate = () => {
@ -111,13 +111,7 @@ const TimelineTranslate = () => {
})
: t('componentTimeline:shared.translate.default')}
</CustomText>
{isFetching ? (
<Circle
size={StyleConstants.Font.Size.M}
color={colors.disabled}
style={{ marginLeft: StyleConstants.Spacing.S }}
/>
) : null}
{isFetching ? <Loading style={{ marginLeft: StyleConstants.Spacing.S }} /> : null}
</Pressable>
{devView()}
{data && data.error === undefined

17
src/components/openLink.ts
View File

@ -9,13 +9,7 @@ import { getGlobalStorage } from '@utils/storage/actions'
import * as Linking from 'expo-linking'
import * as WebBrowser from 'expo-web-browser'
export let loadingLink = false
const openLink = async (url: string, navigation?: any) => {
if (loadingLink) {
return
}
const handleNavigation = (page: 'Tab-Shared-Toot' | 'Tab-Shared-Account', options: any) => {
if (navigation) {
navigation.push(page, options)
@ -28,7 +22,6 @@ const openLink = async (url: string, navigation?: any) => {
const match = urlMatcher(url)
// If a tooot can be found
if (match?.status?.id) {
loadingLink = true
let response: Mastodon.Status | undefined = undefined
const queryKey: QueryKeyStatus = [
@ -39,15 +32,13 @@ const openLink = async (url: string, navigation?: any) => {
if (cache) {
handleNavigation('Tab-Shared-Toot', { toot: cache })
loadingLink = false
return
} else {
try {
response = await searchLocalStatus(url)
response = await searchLocalStatus(url, true)
} catch {}
if (response) {
handleNavigation('Tab-Shared-Toot', { toot: response })
loadingLink = false
return
}
}
@ -60,7 +51,6 @@ const openLink = async (url: string, navigation?: any) => {
return
}
loadingLink = true
let response: Mastodon.Account | undefined = undefined
const queryKey: QueryKeyAccount = [
@ -71,21 +61,18 @@ const openLink = async (url: string, navigation?: any) => {
if (cache) {
handleNavigation('Tab-Shared-Account', { account: cache })
loadingLink = false
return
} else {
try {
response = await searchLocalAccount(url)
response = await searchLocalAccount(url, true)
} catch {}
if (response) {
handleNavigation('Tab-Shared-Account', { account: response })
loadingLink = false
return
}
}
}
loadingLink = false
switch (getGlobalStorage.string('app.browser')) {
// Some links might end with an empty space at the end that triggers an error
case 'internal':

3
src/i18n/en/screens/tabs.json
View File

@ -373,7 +373,8 @@
"hashtags": "Hashtag",
"statuses": "Toot"
},
"notFound": "Cannot find <bold>{{searchTerm}}</bold> related {{type}}"
"notFound": "Cannot find <bold>{{searchTerm}}</bold> related {{type}}",
"noResult": "Cannot find anything, please try a different term"
},
"toot": {
"name": "Discussions",

9
src/i18n/index.ts
View File

@ -1,3 +1,4 @@
import * as Localization from 'expo-localization'
import i18n from 'i18next'
import { initReactI18next } from 'react-i18next'
@ -128,4 +129,12 @@ i18n.use(initReactI18next).init({
}
})
const timezone = Localization.getCalendars()[0].timeZone
if (timezone && '__setDefaultTimeZone' in Intl.DateTimeFormat) {
try {
// @ts-ignore
Intl.DateTimeFormat.__setDefaultTimeZone(timezone)
} catch {}
}
export default i18n

12
src/screens/Announcements.tsx
View File

@ -1,5 +1,6 @@
import Button from '@components/Button'
import haptics from '@components/haptics'
import { Loading } from '@components/Loading'
import { ParseHTML } from '@components/Parse'
import RelativeTime from '@components/RelativeTime'
import CustomText from '@components/Text'
@ -20,7 +21,6 @@ import {
StyleSheet,
View
} from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import FastImage from 'react-native-fast-image'
import { FlatList, ScrollView } from 'react-native-gesture-handler'
import { SafeAreaView } from 'react-native-safe-area-context'
@ -191,14 +191,8 @@ const ScreenAnnouncements: React.FC<RootStackScreenProps<'Screen-Announcements'>
const ListEmptyComponent = () => {
return (
<View
style={{
width: Dimensions.get('window').width,
justifyContent: 'center',
alignItems: 'center'
}}
>
<Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
<View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<Loading />
</View>
)
}

4
src/screens/Compose/Root/Footer/Attachments.tsx
View File

@ -1,6 +1,7 @@
import Button from '@components/Button'
import haptics from '@components/haptics'
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import { MAX_MEDIA_ATTACHMENTS } from '@components/mediaSelector'
import CustomText from '@components/Text'
import { useActionSheet } from '@expo/react-native-action-sheet'
@ -11,7 +12,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
import React, { RefObject, useContext, useEffect, useRef } from 'react'
import { useTranslation } from 'react-i18next'
import { FlatList, Pressable, StyleSheet, View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import FastImage from 'react-native-fast-image'
import ComposeContext from '../../utils/createContext'
import { ExtendedAttachment } from '../../utils/types'
@ -135,7 +135,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
backgroundColor: colors.backgroundOverlayInvert
}}
>
<Circle size={StyleConstants.Font.Size.L} color={colors.primaryOverlay} />
<Loading />
</View>
) : (
<View

6
src/screens/Compose/Root/Suggestions.tsx
View File

@ -2,13 +2,13 @@ import ComponentAccount from '@components/Account'
import haptics from '@components/haptics'
import ComponentHashtag from '@components/Hashtag'
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import ComponentSeparator from '@components/Separator'
import { useSearchQuery } from '@utils/queryHooks/search'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React, { Fragment, useContext, useEffect } from 'react'
import { View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import ComposeContext from '../utils/createContext'
import { formatText } from '../utils/processText'
@ -38,7 +38,7 @@ const ComposeRootSuggestions: React.FC = () => {
const { isFetching, data, refetch } = useSearchQuery({
type: mapSchemaToType(),
term: composeState.tag?.raw.substring(1),
limit: 10,
...(mapSchemaToType() === 'accounts' && { following: true }),
options: { enabled: false }
})
useEffect(() => {
@ -125,7 +125,7 @@ const ComposeRootSuggestions: React.FC = () => {
key='listEmpty'
style={{ flex: 1, alignItems: 'center', marginVertical: StyleConstants.Spacing.M }}
>
<Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
<Loading />
</View>
) : (
<>{main()}</>

8
src/screens/ImageViewer/save.ts
View File

@ -4,7 +4,7 @@ import { CameraRoll } from '@react-native-camera-roll/camera-roll'
import { RootStackParamList } from '@utils/navigation/navigators'
import * as FileSystem from 'expo-file-system'
import i18next from 'i18next'
import { PermissionsAndroid, Platform } from 'react-native'
import { Linking, PermissionsAndroid, Platform } from 'react-native'
type CommonProps = {
image: RootStackParamList['Screen-ImagesViewer']['imageUrls'][0]
@ -19,7 +19,11 @@ const saveIos = async ({ image }: CommonProps) => {
message: i18next.t('screenImageViewer:content.save.succeed')
})
})
.catch(() => {
.catch(err => {
if (err?.code === 'E_PHOTO_LIBRARY_AUTH_DENIED') {
Linking.openSettings()
return
}
if (image.remote_url) {
CameraRoll.save(image.remote_url)
.then(() => {

28
src/screens/Tabs/Shared/Search/Empty.tsx
View File

@ -1,4 +1,5 @@
import ComponentHashtag from '@components/Hashtag'
import { Loading } from '@components/Loading'
import ComponentSeparator from '@components/Separator'
import CustomText from '@components/Text'
import { useTrendsQuery } from '@utils/queryHooks/trends'
@ -6,26 +7,37 @@ import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { StyleSheet, TextInput, View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import { StyleSheet, View } from 'react-native'
export interface Props {
isFetching: boolean
inputRef: React.RefObject<TextInput>
setSearchTerm: React.Dispatch<React.SetStateAction<string>>
searchTerm: string
}
const SearchEmpty: React.FC<Props> = ({ isFetching, inputRef, setSearchTerm }) => {
const SearchEmpty: React.FC<Props> = ({ isFetching, searchTerm }) => {
const { colors } = useTheme()
const { t } = useTranslation('screenTabs')
const trendsTags = useTrendsQuery({ type: 'tags' })
return (
<View style={{ paddingVertical: StyleConstants.Spacing.Global.PagePadding }}>
<View
style={{
flex: 1,
minHeight: '100%',
paddingVertical: StyleConstants.Spacing.Global.PagePadding
}}
>
{isFetching ? (
<View style={{ flex: 1, alignItems: 'center' }}>
<Circle size={StyleConstants.Font.Size.M * 1.25} color={colors.secondary} />
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<Loading />
</View>
) : searchTerm.length ? (
<View style={{ flex: 1, alignItems: 'center', justifyContent: 'center' }}>
<CustomText
style={{ color: colors.primaryDefault }}
children={t('shared.search.noResult')}
/>
</View>
) : (
<>

5
src/screens/Tabs/Shared/Search/index.tsx
View File

@ -131,7 +131,6 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
style={{ flex: 1 }}
>
<SectionList
style={{ minHeight: '100%' }}
sections={data || []}
renderItem={({ item, section }: { item: any; section: any }) => {
switch (section.title) {
@ -146,9 +145,7 @@ const TabSharedSearch: React.FC<TabSharedStackScreenProps<'Tab-Shared-Search'>>
}
}}
stickySectionHeadersEnabled
ListEmptyComponent={
<SearchEmpty isFetching={isFetching} inputRef={inputRef} setSearchTerm={setSearchTerm} />
}
ListEmptyComponent={<SearchEmpty isFetching={isFetching} searchTerm={searchTerm} />}
keyboardShouldPersistTaps='always'
renderSectionHeader={({ section: { translation } }) => (
<View

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

@ -1,5 +1,6 @@
import { HeaderLeft } from '@components/Header'
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import ComponentSeparator from '@components/Separator'
import CustomText from '@components/Text'
import TimelineDefault from '@components/Timeline/Default'
@ -15,8 +16,7 @@ import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import React, { useEffect, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { Alert, FlatList, Pressable, View } from 'react-native'
import { Circle } from 'react-native-animated-spinkit'
import { Alert, FlatList, Platform, Pressable, View } from 'react-native'
import { Path, Svg } from 'react-native-svg'
const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
@ -34,6 +34,8 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
remote: ['Timeline', { page: 'Toot', toot: toot.id, remote: true }]
}
const flRef = useRef<FlatList<Mastodon.Status & { _level?: number }>>(null)
useEffect(() => {
navigation.setOptions({
headerTitle: () => (
@ -69,12 +71,12 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
navigation.setParams({ toot, queryKey: queryKey.local })
}, [hasRemoteContent])
const flRef = useRef<FlatList>(null)
const scrolled = useRef(false)
const PREV_PER_BATCH = 1
const ancestorsCache = useRef<(Mastodon.Status & { _level?: number })[]>()
const loaded = useRef<boolean>(false)
const match = urlMatcher(toot.url || toot.uri)
const highlightIndex = useRef<number>(0)
const query = useQuery<{ pages: { body: Mastodon.Status[] }[] }>(
const query = useQuery<{ pages: { body: (Mastodon.Status & { _level?: number })[] }[] }>(
queryKey.local,
async () => {
const context = await apiInstance<{
@ -85,15 +87,14 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
url: `statuses/${toot.id}/context`
}).then(res => res.body)
highlightIndex.current = context.ancestors.length
const statuses = [...context.ancestors, { ...toot }, ...context.descendants]
ancestorsCache.current = [...context.ancestors]
const statuses = [{ ...toot }, ...context.descendants]
return {
pages: [
{
body: statuses.map((status, index) => {
if (index < highlightIndex.current || status.id === toot.id) {
if (index === 0) {
status._level = 0
return status
} else {
@ -108,7 +109,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
}
},
{
placeholderData: { pages: [{ body: [toot] }] },
placeholderData: { pages: [{ body: [{ ...toot, _level: 0 }] }] },
enabled: !toot._remote,
staleTime: 0,
refetchOnMount: true,
@ -117,30 +118,10 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
navigation.goBack()
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<Mastodon.Status[]>(
const remoteQuery = useQuery<Mastodon.Status[]>(
queryKey.remote,
async () => {
const domain = match?.domain
@ -165,19 +146,45 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
return Promise.resolve([{ ...toot }])
}
highlightIndex.current = context.ancestors.length
const statuses = [...context.ancestors, { ...toot }, ...context.descendants]
ancestorsCache.current = context.ancestors.map(ancestor => {
const localMatch = ancestorsCache.current?.find(local => local.uri === ancestor.uri)
if (localMatch) {
return { ...localMatch, _level: 0 }
} else {
return {
...ancestor,
_remote: true,
account: { ...ancestor.account, _remote: true },
mentions: ancestor.mentions.map(mention => ({
...mention,
_remote: true
})),
...(ancestor.reblog && {
reblog: {
...ancestor.reblog,
_remote: true,
account: { ...ancestor.reblog.account, _remote: true },
mentions: ancestor.reblog.mentions.map(mention => ({
...mention,
_remote: true
}))
}
})
}
}
})
const statuses = [{ ...toot }, ...context.descendants]
return statuses.map((status, index) => {
if (index < highlightIndex.current || status.id === toot.id) {
if (index === 0) {
status._level = 0
return status
} else {
const repliedLevel: number =
statuses.find(s => s.id === status.in_reply_to_id)?._level || 0
status._level = repliedLevel + 1
return status
}
const repliedLevel: number = statuses.find(s => s.id === status.in_reply_to_id)?._level || 0
status._level = repliedLevel + 1
return status
})
},
{
@ -187,7 +194,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
match?.domain !== getAccountStorage.string('auth.domain'),
staleTime: 0,
refetchOnMount: true,
onSuccess: data => {
onSuccess: async data => {
if ((query.data?.pages[0].body.length || 0) < 1 && data.length < 1) {
navigation.goBack()
return
@ -195,59 +202,85 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
if ((query.data?.pages[0].body.length || 0) < data.length) {
queryClient.cancelQueries(queryKey.local)
queryClient.setQueryData<{
pages: { body: Mastodon.Status[] }[]
}>(queryKey.local, old => {
setHasRemoteContent(true)
return {
pages: [
{
body: data.map(remote => {
const localMatch = old?.pages[0].body.find(local => local.uri === remote.uri)
if (localMatch) {
return { ...localMatch, _level: remote._level }
} 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
}))
}
})
queryClient.setQueryData<{ pages: { body: Mastodon.Status[] }[] }>(
queryKey.local,
old => {
setHasRemoteContent(true)
return {
pages: [
{
body: data.map(remote => {
const localMatch = old?.pages[0].body.find(local => local.uri === remote.uri)
if (localMatch) {
return { ...localMatch, _level: remote._level }
} 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
}))
}
})
}
}
}
})
}
]
})
}
]
}
}
})
)
}
scrolled.current = true
const pointer = data.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
loaded.current = true
if (ancestorsCache.current?.length) {
switch (Platform.OS) {
case 'ios':
for (let [] of Array(
Math.ceil(ancestorsCache.current.length / PREV_PER_BATCH)
).entries()) {
await new Promise(promise => setTimeout(promise, 64))
queryClient.setQueryData<{ pages: { body: Mastodon.Status[] }[] }>(
queryKey.local,
old => {
const insert = ancestorsCache.current?.slice(-PREV_PER_BATCH)
ancestorsCache.current = ancestorsCache.current?.slice(0, -PREV_PER_BATCH)
if (insert) {
old?.pages[0].body.unshift(...insert)
}
return old
}
)
}
break
default:
queryClient.setQueryData<{ pages: { body: Mastodon.Status[] }[] }>(
queryKey.local,
old => {
ancestorsCache.current && old?.pages[0].body.unshift(...ancestorsCache.current)
return old
}
)
setTimeout(() => {
flRef.current?.scrollToIndex({
index: ancestorsCache.current?.length || 0,
viewOffset: 50
})
}, 50)
break
}
}
}
}
@ -265,29 +298,18 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
data={query.data?.pages?.[0].body}
renderItem={({ item, index }) => {
const prev = query.data?.pages[0].body[index - 1]?._level || 0
const curr = item._level
const curr = item._level || 0
const next = query.data?.pages[0].body[index + 1]?._level || 0
return (
<View
style={{
paddingLeft:
index > highlightIndex.current
? Math.min(item._level - 1, MAX_LEVEL) * StyleConstants.Spacing.S
: undefined
}}
style={{ paddingLeft: Math.min(curr - 1, MAX_LEVEL) * StyleConstants.Spacing.S }}
onLayout={({
nativeEvent: {
layout: { height }
}
}) => setHeights({ ...heights, [index]: height })}
>
<TimelineDefault
item={item}
queryKey={item._remote ? queryKey.remote : queryKey.local}
highlighted={toot.id === item.id || item.id === 'cached'}
isConversation={toot.id !== item.id && item.id !== 'cached'}
/>
{curr > 1 || next > 1
? [...new Array(curr)].map((_, i) => {
if (i > MAX_LEVEL) return null
@ -371,6 +393,13 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
}
})
: null}
<TimelineDefault
item={item}
queryKey={item._remote ? queryKey.remote : queryKey.local}
highlighted={toot.id === item.id || item.id === 'cached'}
isConversation={toot.id !== item.id && item.id !== 'cached'}
noBackground
/>
{/* <CustomText
children={query.data?.pages[0].body[index - 1]?._level}
style={{ position: 'absolute', top: 4, left: 4, color: colors.red }}
@ -397,7 +426,7 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
? 0
: StyleConstants.Avatar.XS +
StyleConstants.Spacing.S +
Math.min(Math.max(0, leadingItem._level - 1), MAX_LEVEL) *
Math.min(Math.max(0, (leadingItem._level || 0) - 1), MAX_LEVEL) *
StyleConstants.Spacing.S
}
/>
@ -416,35 +445,27 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
</>
)
}}
onScrollToIndexFailed={error => {
const offset = error.averageItemLength * error.index
flRef.current?.scrollToOffset({ offset })
try {
error.index < (query.data?.pages[0].body.length || 0) &&
ListFooterComponent={
query.isFetching || remoteQuery.isFetching ? (
<View style={{ flex: 1, alignItems: 'center' }} children={<Loading />} />
) : null
}
{...(loaded.current && { maintainVisibleContentPosition: { minIndexForVisible: 0 } })}
{...(Platform.OS !== 'ios' && {
onScrollToIndexFailed: error => {
const offset = error.averageItemLength * error.index
flRef.current?.scrollToOffset({ offset })
error.index < (ancestorsCache.current?.length || 0) &&
setTimeout(
() =>
flRef.current?.scrollToIndex({
index: error.index,
viewOffset: 100
viewOffset: 50
}),
500
50
)
} catch {}
}}
ListFooterComponent={
<View
style={{
flex: 1,
alignItems: 'center',
backgroundColor: colors.backgroundDefault,
marginHorizontal: StyleConstants.Spacing.M
}}
>
{query.isFetching ? (
<Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
) : null}
</View>
}
}
})}
/>
)
}

18
src/screens/Tabs/Shared/Users.tsx
View File

@ -1,6 +1,7 @@
import ComponentAccount from '@components/Account'
import { HeaderLeft } from '@components/Header'
import Icon from '@components/Icon'
import { Loading } from '@components/Loading'
import ComponentSeparator from '@components/Separator'
import CustomText from '@components/Text'
import apiInstance from '@utils/api/instance'
@ -13,7 +14,6 @@ import { useTheme } from '@utils/styles/ThemeManager'
import React, { useEffect, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { View } from 'react-native'
import { Circle, Flow } from 'react-native-animated-spinkit'
import { FlatList } from 'react-native-gesture-handler'
const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> = ({
@ -36,7 +36,7 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
...queryKey[1]
})
const [isSearching, setIsSearching] = useState(false)
const [isSearching, setIsSearching] = useState<number | null>(null)
return (
<FlatList
@ -46,14 +46,14 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
minHeight: '100%',
paddingVertical: StyleConstants.Spacing.Global.PagePadding
}}
renderItem={({ item }) => (
renderItem={({ item, index }) => (
<ComponentAccount
account={item}
props={{
disabled: isSearching,
disabled: isSearching === index,
onPress: () => {
if (data?.pages[0]?.remoteData) {
setIsSearching(true)
setIsSearching(index)
apiInstance<SearchResult>({
version: 'v2',
method: 'get',
@ -66,18 +66,18 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
}
})
.then(res => {
setIsSearching(false)
setIsSearching(null)
if (res.body.accounts[0]) {
navigation.push('Tab-Shared-Account', { account: res.body.accounts[0] })
}
})
.catch(() => setIsSearching(false))
.catch(() => setIsSearching(null))
} else {
navigation.push('Tab-Shared-Account', { account: item })
}
}
}}
children={<Flow size={StyleConstants.Font.Size.L} color={colors.secondary} />}
children={<Loading />}
/>
)}
onEndReached={() => hasNextPage && !isFetchingNextPage && fetchNextPage()}
@ -93,7 +93,7 @@ const TabSharedUsers: React.FC<TabSharedStackScreenProps<'Tab-Shared-Users'>> =
alignItems: 'center'
}}
>
<Circle size={StyleConstants.Font.Size.L} color={colors.secondary} />
<Loading />
</View>
) : null
}

2
src/utils/api/instance.ts
View File

@ -13,7 +13,7 @@ export type Params = {
}
headers?: { [key: string]: string }
body?: FormData
extras?: Omit<AxiosRequestConfig, 'method' | 'url' | 'params' | 'headers' | 'data'>
extras?: Omit<AxiosRequestConfig, 'method' | 'baseURL' | 'url' | 'params' | 'headers' | 'data'>
}
const apiInstance = async <T = unknown>({

11
src/utils/push/updateExpoToken.ts
View File

@ -4,7 +4,7 @@ import { getGlobalStorage, setGlobalStorage } from '@utils/storage/actions'
import * as Notifications from 'expo-notifications'
import { Platform } from 'react-native'
export const updateExpoToken = async () => {
export const updateExpoToken = async (): Promise<string> => {
const expoToken = getGlobalStorage.string('app.expo_token')
if (Platform.OS === 'android') {
@ -12,16 +12,19 @@ export const updateExpoToken = async () => {
}
if (expoToken?.length) {
return Promise.resolve()
return Promise.resolve(expoToken)
} else {
if (isDevelopment) {
setGlobalStorage('app.expo_token', 'ExponentPushToken[DEVELOPMENT_1]')
return Promise.resolve()
return Promise.resolve('ExponentPushToken[DEVELOPMENT_1]')
}
return await Notifications.getExpoPushTokenAsync({
experienceId: '@xmflsct/tooot',
applicationId: 'com.xmflsct.app.tooot'
}).then(({ data }) => setGlobalStorage('app.expo_token', data))
}).then(({ data }) => {
setGlobalStorage('app.expo_token', data)
return data
})
}
}

63
src/utils/push/useConnect.ts
View File

@ -5,6 +5,7 @@ import apiGeneral from '@utils/api/general'
import apiTooot from '@utils/api/tooot'
import navigationRef from '@utils/navigation/navigationRef'
import {
generateAccountKey,
getAccountDetails,
getGlobalStorage,
setAccountStorage,
@ -12,7 +13,7 @@ import {
} from '@utils/storage/actions'
import { AxiosError } from 'axios'
import * as Notifications from 'expo-notifications'
import { useEffect } from 'react'
import { useEffect, useRef } from 'react'
import { useTranslation } from 'react-i18next'
import { AppState } from 'react-native'
import { updateExpoToken } from './updateExpoToken'
@ -20,22 +21,32 @@ import { updateExpoToken } from './updateExpoToken'
const pushUseConnect = () => {
const { t } = useTranslation('screens')
useEffect(() => {
updateExpoToken()
}, [])
const startupChecked = useRef<boolean>(false)
const [expoToken] = useGlobalStorage.string('app.expo_token')
const pushEnabledCount = getGlobalStorage.object('accounts')?.filter(account => {
return getAccountDetails(['push'], account)?.push?.global
}).length
const accounts = getGlobalStorage.object('accounts')
const pushEnabled = accounts
?.map(account => {
const details = getAccountDetails(['push', 'auth.domain', 'auth.account.id'], account)
if (details?.push?.global) {
return {
accountKey: generateAccountKey({
domain: details['auth.domain'],
id: details['auth.account.id']
}),
push: details.push
}
}
})
.filter(d => !!d)
const connectQuery = useQuery<any, AxiosError>(
const connectQuery = useQuery<{ accounts: string[] } | undefined, AxiosError>(
['tooot', { endpoint: 'push/connect' }],
() =>
apiTooot<Mastodon.Status>({
apiTooot<{ accounts: string[] } | undefined>({
method: 'get',
url: `push/connect/${expoToken}`
}),
}).then(res => res.body),
{
enabled: false,
retry: (failureCount, error) => {
@ -48,6 +59,17 @@ const pushUseConnect = () => {
refetchOnWindowFocus: false,
refetchOnReconnect: false,
onSettled: () => Notifications.setBadgeCountAsync(0),
onSuccess: data => {
if (!startupChecked.current && data?.accounts) {
startupChecked.current = true
for (const acct of data.accounts) {
const matchedAcct = pushEnabled?.find(p => p?.accountKey === acct)
if (matchedAcct && !matchedAcct.push.global) {
setAccountStorage([{ key: 'push', value: { ...matchedAcct.push, global: true } }])
}
}
}
},
onError: error => {
if (error?.status == 404) {
displayMessage({
@ -96,18 +118,21 @@ const pushUseConnect = () => {
)
useEffect(() => {
Sentry.setTags({ expoToken, pushEnabledCount })
updateExpoToken().then(async token => {
const badgeCount = await Notifications.getBadgeCountAsync()
if (token && (pushEnabled?.length || badgeCount)) {
connectQuery.refetch()
}
})
}, [])
if (expoToken && pushEnabledCount) {
connectQuery.refetch()
}
useEffect(() => {
Sentry.setTags({ expoToken, pushEnabledCount: pushEnabled?.length })
const appStateListener = AppState.addEventListener('change', state => {
if (expoToken && pushEnabledCount && state === 'active') {
if (expoToken && pushEnabled?.length && state === 'active') {
Notifications.getBadgeCountAsync().then(count => {
if (count > 0) {
connectQuery.refetch()
}
if (count > 0) connectQuery.refetch()
})
}
})
@ -115,7 +140,7 @@ const pushUseConnect = () => {
return () => {
appStateListener.remove()
}
}, [expoToken, pushEnabledCount])
}, [expoToken, pushEnabled?.length])
}
export default pushUseConnect

33
src/utils/queryHooks/search.ts
View File

@ -9,6 +9,7 @@ export type QueryKeySearch = [
type?: 'accounts' | 'hashtags' | 'statuses'
term?: string
limit?: number
following?: boolean
}
]
@ -18,8 +19,8 @@ export type SearchResult = {
statuses: Mastodon.Status[]
}
const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeySearch>) => {
const { type, term, limit = 20 } = queryKey[1]
const queryFunction = async ({ queryKey, meta }: QueryFunctionContext<QueryKeySearch>) => {
const { type, term, limit = 10, following = false } = queryKey[1]
if (!term?.length) {
return Promise.reject('Empty search term')
}
@ -31,8 +32,10 @@ const queryFunction = async ({ queryKey }: QueryFunctionContext<QueryKeySearch>)
q: term,
...(type && { type }),
limit,
resolve: true
}
resolve: true,
following
},
...(meta && { extras: meta })
})
return res.body
}
@ -47,10 +50,18 @@ const useSearchQuery = <T = SearchResult>({
return useQuery(queryKey, queryFunction, { ...options, staleTime: 3600, cacheTime: 3600 })
}
export const searchLocalStatus = async (uri: Mastodon.Status['uri']): Promise<Mastodon.Status> => {
export const searchLocalStatus = async (
uri: Mastodon.Status['uri'],
timeout: boolean = false
): Promise<Mastodon.Status> => {
const queryKey: QueryKeySearch = ['Search', { type: 'statuses', term: uri, limit: 1 }]
return await queryClient
.fetchQuery(queryKey, queryFunction, { staleTime: 3600, cacheTime: 3600 })
.fetchQuery(queryKey, queryFunction, {
staleTime: 3600,
cacheTime: 3600,
retry: false,
...(timeout && { meta: { timeout: 1000 } })
})
.then(res =>
res.statuses[0]?.uri === uri || res.statuses[0]?.url === uri
? res.statuses[0]
@ -59,11 +70,17 @@ export const searchLocalStatus = async (uri: Mastodon.Status['uri']): Promise<Ma
}
export const searchLocalAccount = async (
url: Mastodon.Account['url']
url: Mastodon.Account['url'],
timeout: boolean = false
): Promise<Mastodon.Account> => {
const queryKey: QueryKeySearch = ['Search', { type: 'accounts', term: url, limit: 1 }]
return await queryClient
.fetchQuery(queryKey, queryFunction, { staleTime: 3600, cacheTime: 3600 })
.fetchQuery(queryKey, queryFunction, {
staleTime: 3600,
cacheTime: 3600,
retry: false,
...(timeout && { meta: { timeout: 1000 } })
})
.then(res => (res.accounts[0].url === url ? res.accounts[0] : Promise.reject()))
}

7
src/utils/queryHooks/timeline.ts
View File

@ -11,7 +11,7 @@ import apiInstance from '@utils/api/instance'
import { featureCheck } from '@utils/helpers/featureCheck'
import { useNavState } from '@utils/navigation/navigators'
import { queryClient } from '@utils/queryHooks'
import { getAccountStorage } from '@utils/storage/actions'
import { getAccountStorage, setAccountStorage } from '@utils/storage/actions'
import { AxiosError } from 'axios'
import { uniqBy } from 'lodash'
import { searchLocalStatus } from './search'
@ -85,6 +85,11 @@ export const queryFunctionTimeline = async ({
url: 'timelines/home',
params
}).then(res => {
if (marker && !res.body.length) {
setAccountStorage([{ key: 'read_marker_following', value: undefined }])
return Promise.reject()
}
if (!page.showBoosts || !page.showReplies) {
return {
...res,

14
src/utils/startup/timezone.ts
View File

@ -1,14 +0,0 @@
import * as Localization from 'expo-localization'
import log from './log'
const timezone = () => {
log('log', 'Timezone', Localization.getCalendars()[0].timeZone || 'unknown')
if ('__setDefaultTimeZone' in Intl.DateTimeFormat) {
try {
// @ts-ignore
Intl.DateTimeFormat.__setDefaultTimeZone(Intl.DateTimeFormat.__setDefaultTimeZone('xxx'))
} catch {}
}
}
export default timezone

11
yarn.lock
View File

@ -9549,16 +9549,6 @@ __metadata:
languageName: node
linkType: hard
"react-native-animated-spinkit@npm:^1.5.2":
version: 1.5.2
resolution: "react-native-animated-spinkit@npm:1.5.2"
peerDependencies:
react: "*"
react-native: "*"
checksum: 5d84b0958b3f9db5223d7c2af242eae45f133cf50715be56f1e266d7c04fe5ecdbd7e01b08146748b06daaf914fe8bc64f13df7faaee98bc687094ca10cae61e
languageName: node
linkType: hard
"react-native-blurhash@npm:^1.1.10":
version: 1.1.10
resolution: "react-native-blurhash@npm:1.1.10"
@ -11412,7 +11402,6 @@ __metadata:
react-i18next: ^12.1.4
react-intl: ^6.2.5
react-native: ^0.70.6
react-native-animated-spinkit: ^1.5.2
react-native-blurhash: ^1.1.10
react-native-clean-project: ^4.0.1
react-native-fast-image: ^8.6.3