UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete filter local settings

master
Claire 2022-08-25 09:01:38 +02:00
parent 0b733ca790
commit 3844f15da0
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/javascript/flavours/glitch/features/local_settings/page/index.js
View File

@ -24,10 +24,6 @@ const messages = defineMessages({
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' },
filters_drop: { id: 'settings.filtering_behavior.drop', defaultMessage: 'Hide filtered toots completely' },
filters_upstream: { id: 'settings.filtering_behavior.upstream', defaultMessage: 'Show "filtered" like vanilla Mastodon' },
filters_hide: { id: 'settings.filtering_behavior.hide', defaultMessage: 'Show "filtered" and add a button to display why' },
filters_cw: { id: 'settings.filtering_behavior.cw', defaultMessage: 'Still display the post, and add filtered words to content warning' },
rewrite_mentions_no: { id: 'settings.rewrite_mentions_no', defaultMessage: 'Do not rewrite mentions' },
rewrite_mentions_acct: { id: 'settings.rewrite_mentions_acct', defaultMessage: 'Rewrite with username and domain (when the account is remote)' },
rewrite_mentions_username: { id: 'settings.rewrite_mentions_username', defaultMessage: 'Rewrite with username' },
@ -358,25 +354,6 @@ class LocalSettingsPage extends React.PureComponent {
</section>
</div>
),
({ intl, onChange, settings }) => (
<div className='glitch local-settings__page filters'>
<h1><FormattedMessage id='settings.filters' defaultMessage='Filters' /></h1>
<LocalSettingsPageItem
settings={settings}
item={['filtering_behavior']}
id='mastodon-settings--filters-behavior'
onChange={onChange}
options={[
{ value: 'drop', message: intl.formatMessage(messages.filters_drop) },
{ value: 'upstream', message: intl.formatMessage(messages.filters_upstream) },
{ value: 'hide', message: intl.formatMessage(messages.filters_hide) },
{ value: 'content_warning', message: intl.formatMessage(messages.filters_cw) }
]}
>
<FormattedMessage id='settings.filtering_behavior' defaultMessage='Filtering behavior' />
</LocalSettingsPageItem>
</div>
),
({ onChange, settings }) => (
<div className='glitch local-settings__page collapsed'>
<h1><FormattedMessage id='settings.collapsed_statuses' defaultMessage='Collapsed toots' /></h1>

1
app/javascript/flavours/glitch/reducers/local_settings.js
View File

@ -21,7 +21,6 @@ const initialState = ImmutableMap({
inline_preview_cards: true,
hicolor_privacy_icons: false,
show_content_type_choice: false,
filtering_behavior: 'hide',
tag_misleading_links: true,
rewrite_mentions: 'no',
content_warnings : ImmutableMap({