Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add option to not automatically unfold content warnings matching a regexp

Browse source 
Fixes #678
This commit is contained in:
Thibaut Girka 2018-08-28 17:16:30 +02:00 • committed by ThibG
parent 5c400a2842
commit c6942a5283
5 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/javascript/flavours/glitch/features/local_settings/page/index.js
View file

@ -17,6 +17,7 @@ const messages = defineMessages({
side_arm_keep: { id: 'settings.side_arm_reply_mode.keep', defaultMessage: 'Keep secondary toot button to set privacy' },
side_arm_copy: { id: 'settings.side_arm_reply_mode.copy', defaultMessage: 'Copy privacy setting of the toot being replied to' },
side_arm_restrict: { id: 'settings.side_arm_reply_mode.restrict', defaultMessage: 'Restrict privacy setting to that of the toot being replied to' },
regexp: { id: 'settings.content_warnings.regexp', defaultMessage: 'Regular expression' },
});
@injectIntl
@ -122,7 +123,7 @@ export default class LocalSettingsPage extends React.PureComponent {
</section>
</div>
),
({ onChange, settings }) => (
({ intl, onChange, settings }) => (
<div className='glitch local-settings__page content_warnings'>
<h1><FormattedMessage id='settings.content_warnings' defaultMessage='Content warnings' /></h1>
<LocalSettingsPageItem
@ -133,6 +134,16 @@ export default class LocalSettingsPage extends React.PureComponent {
>
<FormattedMessage id='settings.enable_content_warnings_auto_unfold' defaultMessage='Automatically unfold content-warnings' />
</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)}
>
<FormattedMessage id='settings.content_warnings_filter' defaultMessage='Content warnings to not automatically unfold:' />
</LocalSettingsPageItem>
</div>
),
({ onChange, settings }) => (