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

Restructure removing remote

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-02-20 19:12:44 +01:00
parent 9fdf3ab640
commit 45681fc1f5
71 changed files with 998 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import TimelinePoll from '@components/Timeline/Shared/Poll'
import { useNavigation } from '@react-navigation/native'
import { StackNavigationProp } from '@react-navigation/stack'
import { QueryKeyTimeline } from '@utils/queryHooks/timeline'
import { getLocalAccount } from '@utils/slices/instancesSlice'
import { getInstanceAccount } from '@utils/slices/instancesSlice'
import { StyleConstants } from '@utils/styles/constants'
import { useTheme } from '@utils/styles/ThemeManager'
import { uniqBy } from 'lodash'
@ -41,8 +41,8 @@ const TimelineDefault: React.FC<Props> = ({
pinned
}) => {
const { theme } = useTheme()
const localAccount = useSelector(
getLocalAccount,
const instanceAccount = useSelector(
getInstanceAccount,
(prev, next) => prev?.id === next?.id
)
const navigation = useNavigation<
@ -118,7 +118,7 @@ const TimelineDefault: React.FC<Props> = ({
statusId={actualStatus.id}
poll={actualStatus.poll}
reblog={item.reblog ? true : false}
sameAccount={actualStatus.account.id === localAccount?.id}
sameAccount={actualStatus.account.id === instanceAccount?.id}
/>
) : null}
{!disableDetails &&
@ -147,7 +147,7 @@ const TimelineDefault: React.FC<Props> = ({
([actualStatus.account] as Mastodon.Account[] &
Mastodon.Mention[])
.concat(actualStatus.mentions)
.filter(d => d.id !== localAccount?.id),
.filter(d => d.id !== instanceAccount?.id),
d => d.id
).map(d => d.acct)}
reblog={item.reblog ? true : false}