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

Fixed #19

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-02-11 01:33:31 +01:00
parent a40a645337
commit d1bddc696a
50 changed files with 271 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ export interface Props {
highlighted?: boolean
disableDetails?: boolean
disableOnPress?: boolean
pinned: Mastodon.Status['id'][]
}
// When the poll is long
@ -33,7 +34,8 @@ const TimelineDefault: React.FC<Props> = ({
origin,
highlighted = false,
disableDetails = false,
disableOnPress = false
disableOnPress = false,
pinned
}) => {
const { theme } = useTheme()
const localAccount = useSelector(
@ -73,7 +75,7 @@ const TimelineDefault: React.FC<Props> = ({
>
{item.reblog ? (
<TimelineActioned action='reblog' account={item.account} />
) : item.isPinned ? (
) : pinned && pinned.includes(item.id) ? (
<TimelineActioned action='pinned' account={item.account} />
) : null}
@ -113,9 +115,11 @@ const TimelineDefault: React.FC<Props> = ({
sameAccount={actualStatus.account.id === localAccount?.id}
/>
) : null}
{!disableDetails && actualStatus.media_attachments.length > 0 && (
{!disableDetails &&
Array.isArray(actualStatus.media_attachments) &&
actualStatus.media_attachments.length ? (
<TimelineAttachment status={actualStatus} />
)}
) : null}
{!disableDetails && actualStatus.card && (
<TimelineCard card={actualStatus.card} />
)}

2
src/components/Timeline/Shared/HeaderNotification.tsx
View File

@ -46,7 +46,7 @@ const TimelineHeaderNotification: React.FC<Props> = ({
onPress={() =>
navigation.navigate('Screen-Actions', {
queryKey,
status,
status: notification.status,
url: notification.status?.url || notification.status?.uri,
type: 'status'
})