[feature] Re-enable auto-unfold CW setting (#46)

Fixes #45

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/46
Co-authored-by: prplecake <me@prplecake.com>
Co-committed-by: prplecake <me@prplecake.com>
This commit is contained in:
prplecake
2025-05-14 17:23:29 +00:00
committed by tobi
parent 8eba3f59f8
commit 02106153ec
4 changed files with 14 additions and 39 deletions
@@ -8,9 +8,6 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
// Our imports
import { expandSpoilers } from 'flavours/glitch/initial_state';
import DeprecatedLocalSettingsPageItem from './deprecated_item';
import LocalSettingsPageItem from './item';
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -308,35 +305,21 @@ class LocalSettingsPage extends PureComponent {
</LocalSettingsPageItem>
<section>
<h2><FormattedMessage id='settings.content_warnings_unfold_opts' defaultMessage='Auto-unfolding options' /></h2>
<DeprecatedLocalSettingsPageItem
<LocalSettingsPageItem
settings={settings}
item={['content_warnings', 'auto_unfold']}
onChange={onChange}
id='mastodon-settings--content_warnings-auto_unfold'
value={expandSpoilers}
>
<FormattedMessage id='settings.enable_content_warnings_auto_unfold' defaultMessage='Automatically unfold content-warnings' />
<span className='hint'>
<FormattedMessage
id='settings.deprecated_setting'
defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}"
values={{
settings_page_link: (
<span>
<FormattedMessage
id='settings.shared_settings_link'
defaultMessage='user preferences'
/>
</span>
),
}}
/>
</span>
</DeprecatedLocalSettingsPageItem>
</LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['content_warnings', 'filter']}
id='mastodon-settings--content_warnings-auto_unfold'
onChange={onChange}
dependsOn={[['content_warnings', 'auto_unfold']]}
placeholder={intl.formatMessage(messages.regexp)}
disabled={!expandSpoilers}
>
<FormattedMessage id='settings.content_warnings_filter' defaultMessage='Content warnings to not automatically unfold:' />
</LocalSettingsPageItem>