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

Use account preference's spoiler expansion setting

Browse Source
This commit is contained in:
Zhiyuan Zheng 2021-11-27 19:34:20 +01:00
parent dbabacc202
commit 3d481624ad
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Timeline/Shared/Content.tsx
View File

@ -1,6 +1,8 @@
import { ParseHTML } from '@components/Parse' import { ParseHTML } from '@components/Parse'
import { getInstanceAccount } from '@utils/slices/instancesSlice'
import React from 'react' import React from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux'
export interface Props { export interface Props {
status: Mastodon.Status status: Mastodon.Status
@ -17,6 +19,7 @@ const TimelineContent = React.memo(
disableDetails = false disableDetails = false
}: Props) => { }: Props) => {
const { t } = useTranslation('componentTimeline') const { t } = useTranslation('componentTimeline')
const instanceAccount = useSelector(getInstanceAccount, () => true)
return ( return (
<> <>
@ -41,7 +44,9 @@ const TimelineContent = React.memo(
emojis={status.emojis} emojis={status.emojis}
mentions={status.mentions} mentions={status.mentions}
tags={status.tags} tags={status.tags}
numberOfLines={1} numberOfLines={
instanceAccount.preferences['reading:expand:spoilers'] ? 999 : 1
}
expandHint={t('shared.content.expandHint')} expandHint={t('shared.content.expandHint')}
highlighted={highlighted} highlighted={highlighted}
disableDetails={disableDetails} disableDetails={disableDetails}