diff --git a/src/components/settings_modal/helpers/help_indicator.vue b/src/components/settings_modal/helpers/help_indicator.vue
new file mode 100644
index 000000000..c48f97b70
--- /dev/null
+++ b/src/components/settings_modal/helpers/help_indicator.vue
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 495ea7e29..34ade4dfc 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -7,6 +7,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue'
import UnitSetting from '../helpers/unit_setting.vue'
import IntegerSetting from '../helpers/integer_setting.vue'
+import HelpIndicator from '../helpers/help_indicator.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import Select from 'src/components/select/select.vue'
@@ -35,7 +36,8 @@ const FilteringTab = {
UnitSetting,
IntegerSetting,
Checkbox,
- Select
+ Select,
+ HelpIndicator
},
computed: {
...SharedComputedObject(),
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 052e17256..f7754090b 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -4,74 +4,122 @@
class="filtering-tab"
>
-
{{ $t('settings.posts') }}
+ {{ $t('settings.filter.clutter') }}
-
-
- {{ $t('settings.hide_filtered_statuses') }}
-
-
- -
-
- {{ $t('settings.hide_wordfiltered_statuses') }}
-
-
- -
-
- {{ $t('settings.hide_muted_threads') }}
-
-
- -
-
- {{ $t('settings.hide_muted_posts') }}
-
-
-
+
+ {{ $t('settings.replies_in_timeline') }}
+
-
-
- {{ $t('settings.mute_bot_posts') }}
-
-
- -
-
- {{ $t('settings.mute_sensitive_posts') }}
-
-
- -
-
+
{{ $t('settings.hide_post_stats') }}
+ -
+
+ {{ $t('settings.hide_user_stats') }}
+
+
-
{{ $t('settings.hide_actor_type_indication') }}
-
- {{ $t('settings.replies_in_timeline') }}
-
-
-
{{ $t('settings.filter.mute_filter') }}
+
+ {{ $t('settings.hide_scrobbles') }}
+
+
+ -
+
+ {{ $t('settings.hide_scrobbles_after') }}
+
+
+
+
+ {{ $t('settings.attachments') }}
+ -
+
+ {{ $t('settings.max_thumbnails') }}
+
+
+ -
+
+ {{ $t('settings.hide_attachments_in_tl') }}
+
+
+ -
+
+ {{ $t('settings.hide_attachments_in_convo') }}
+
+
+
+
+ {{ $t('settings.filter.mute_filter') }}
+ -
+
-
+
+ {{ $t('settings.hide_muted_statuses') }}
+
+
+ -
+
+ {{ $t('settings.hide_filtered_statuses') }}
+
+
+ -
+
+ {{ $t('settings.hide_muted_threads') }}
+
+
+ -
+
+ {{ $t('settings.hide_muted_posts') }}
+
+
+
+
+ -
+
+ {{ $t('settings.mute_bot_posts') }}
+
+
+ -
+
+ {{ $t('settings.mute_sensitive_posts') }}
+
+
-
{{ $t('settings.attachments') }}
-
-
-
- {{ $t('settings.max_thumbnails') }}
-
-
-
-
-
- {{ $t('settings.hide_attachments_in_tl') }}
-
-
-
-
-
- {{ $t('settings.hide_attachments_in_convo') }}
-
-
-
-
-
- {{ $t('settings.hide_scrobbles') }}
-
-
-
-
-
- {{ $t('settings.hide_scrobbles_after') }}
-
-
-
-
-
-
{{ $t('settings.user_profiles') }}
-
- -
-
- {{ $t('settings.hide_user_stats') }}
-
-
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 37f52a89f..0ea770c40 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -412,6 +412,7 @@
"scale_and_layout": "Interface scale and layout",
"enabled": "Enabled",
"filter": {
+ "clutter": "Remove clutter",
"mute_filter": "Mute Filters",
"type": "Filter type",
"regexp": "RegExp",
@@ -428,7 +429,14 @@
"delete": "Remove filter",
"new": "Create filter",
"regexp_error": "Invalid Regular Expression",
- "never_expires": "Never"
+ "never_expires": "Never",
+ "help": {
+ "word": "Simple and RegExp filters test against post's content and subject.",
+ "user": "User filter matches full user handle (user@domain) in the following: author, reply-to and mentions",
+ "regexp": "Regex variants are more advanced and use {link} to match instead of simple substring search.",
+ "regexp_link": "Regular Expressions",
+ "regexp_url": "https://en.wikipedia.org/wiki/Regular_expression"
+ }
},
"mfa": {
"otp": "OTP",
@@ -595,6 +603,7 @@
"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
"hide_filtered_statuses": "Hide all filtered posts",
+ "hide_muted_statuses": "Completely hide all muted posts",
"hide_wordfiltered_statuses": "Hide word-filtered statuses",
"hide_muted_threads": "Hide muted threads",
"import_blocks_from_a_csv_file": "Import blocks from a csv file",