From dafced3a864c80f69316417082aaa08e10adee49 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Mon, 10 Feb 2020 08:04:58 +0000 Subject: [PATCH] MRF Keyword Policy Disclosure --- CHANGELOG.md | 1 + .../mrf_transparency_panel.js | 10 ++++- .../mrf_transparency_panel.vue | 43 +++++++++++++++++++ src/i18n/en.json | 11 ++++- 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abefd958bb..c011835c3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Pleroma AMOLED dark theme - User level domain mutes, under User Settings -> Mutes - Emoji reactions for statuses +- MRF keyword policy disclosure ### Changed - Captcha now resets on failed registrations - Notifications column now cleans itself up to optimize performance when tab is left open for a long time diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.js b/src/components/mrf_transparency_panel/mrf_transparency_panel.js index 6a1baec816..a0b600d2a5 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js @@ -11,7 +11,10 @@ const MRFTransparencyPanel = { rejectInstances: state => get(state, 'instance.federationPolicy.mrf_simple.reject', []), ftlRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.federated_timeline_removal', []), mediaNsfwInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_nsfw', []), - mediaRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_removal', []) + mediaRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_removal', []), + keywordsFtlRemoval: state => get(state, 'instance.federationPolicy.mrf_keyword.federated_timeline_removal', []), + keywordsReject: state => get(state, 'instance.federationPolicy.mrf_keyword.reject', []), + keywordsReplace: state => get(state, 'instance.federationPolicy.mrf_keyword.replace', []) }), hasInstanceSpecificPolicies () { return this.quarantineInstances.length || @@ -20,6 +23,11 @@ const MRFTransparencyPanel = { this.ftlRemovalInstances.length || this.mediaNsfwInstances.length || this.mediaRemovalInstances.length + }, + hasKeywordPolicies () { + return this.keywordsFtlRemoval.length || + this.keywordsReject.length || + this.keywordsReplace.length } } } diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue index d6495dc685..8038e587cb 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue @@ -109,6 +109,49 @@ /> + +

+ {{ $t("about.mrf.keyword.keyword_policies") }} +

+ +
+

{{ $t("about.mrf.keyword.ftl_removal") }}

+ + +
+ +
+

{{ $t("about.mrf.keyword.reject") }}

+ + +
+ +
+

{{ $t("about.mrf.keyword.replace") }}

+ + +
diff --git a/src/i18n/en.json b/src/i18n/en.json index db2ce54dd7..ef841bbba0 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -16,7 +16,16 @@ "mrf_policy_simple_media_removal": "Media Removal", "mrf_policy_simple_media_removal_desc": "This instance removes media from posts on the following instances:", "mrf_policy_simple_media_nsfw": "Media Force-set As Sensitive", - "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:" + "mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:", + "mrf": { + "keyword": { + "keyword_policies": "Keyword Policies", + "ftl_removal": "Removal from \"The Whole Known Network\" Timeline", + "reject": "Reject", + "replace": "Replace", + "is_replaced_by": "→" + } + } }, "chat": { "title": "Chat"