From 94e07f1ead513ce85c89c23eb7e06edbff29b61b Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Tue, 21 Jul 2020 13:29:54 +0300
Subject: [PATCH 1/3] Fix shortening MRF policies on the new tab

---
 src/views/settings/components/Inputs.vue             |  2 +-
 .../inputComponents/SelectInputWithReducedLabels.vue | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue
index d8ca8cc2..b22ba620 100644
--- a/src/views/settings/components/Inputs.vue
+++ b/src/views/settings/components/Inputs.vue
@@ -276,7 +276,7 @@ export default {
         ':parsers',
         ':providers',
         ':method',
-        ':rewrite_policy',
+        ':policies',
         'Pleroma.Web.Auth.Authenticator'
       ].includes(this.setting.key) ||
         (this.settingGroup.key === 'Pleroma.Emails.Mailer' && this.setting.key === ':adapter')
diff --git a/src/views/settings/components/inputComponents/SelectInputWithReducedLabels.vue b/src/views/settings/components/inputComponents/SelectInputWithReducedLabels.vue
index 8e7b9129..9b6b6140 100644
--- a/src/views/settings/components/inputComponents/SelectInputWithReducedLabels.vue
+++ b/src/views/settings/components/inputComponents/SelectInputWithReducedLabels.vue
@@ -56,7 +56,7 @@ export default {
     inputValue() {
       if (this.setting.key === 'Pleroma.Web.Auth.Authenticator') {
         return this.data.value
-      } else if (this.setting.key === ':rewrite_policy') {
+      } else if (this.setting.key === ':policies') {
         return typeof this.data[this.setting.key] === 'string'
           ? [this.data[this.setting.key]]
           : this.data[this.setting.key]
@@ -71,7 +71,7 @@ export default {
   methods: {
     options(suggestions) {
       const prefixes = {
-        ':rewrite_policy': 'Pleroma.Web.ActivityPub.MRF.',
+        ':policies': 'Pleroma.Web.ActivityPub.MRF.',
         'Pleroma.Web.Auth.Authenticator': 'Pleroma.Web.Auth.',
         ':method': 'Pleroma.Captcha.',
         ':adapter': 'Swoosh.Adapters.',
@@ -100,14 +100,6 @@ export default {
         this.setting.key === ':args'
       )
     },
-    rewritePolicyOptions(suggestions) {
-      return suggestions.map(element => {
-        const label = element.split('Pleroma.Web.ActivityPub.MRF.')[1]
-          ? element.split('Pleroma.Web.ActivityPub.MRF.')[1]
-          : element
-        return { value: element, label }
-      })
-    },
     updateSetting(value, group, key, input, type) {
       const updatedValue = getBooleanValue(value)
       this.$store.dispatch('UpdateSettings', { group, key, input, value: updatedValue, type })

From 81177cc96ece3d8919c7d121b990bab383262005 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 22 Jul 2020 17:36:52 +0300
Subject: [PATCH 2/3] Show only those MRF settings that are enabled in MRF
 policies

---
 src/views/settings/components/MRF.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/components/MRF.vue b/src/views/settings/components/MRF.vue
index e35f46cb..ba2454a5 100644
--- a/src/views/settings/components/MRF.vue
+++ b/src/views/settings/components/MRF.vue
@@ -1,10 +1,10 @@
 <template>
   <div v-if="!loading" :class="isSidebarOpen" class="form-container">
     <div v-for="setting in mrfSettings" :key="setting.key">
-      <el-form :model="getSettingData(setting)" :label-position="labelPosition" :label-width="labelWidth">
+      <el-form v-if="showMrfPolicy(setting.key)" :model="getSettingData(setting)" :label-position="labelPosition" :label-width="labelWidth">
         <setting :setting-group="setting" :data="getSettingData(setting)"/>
+        <el-divider v-if="setting" class="divider thick-line"/>
       </el-form>
-      <el-divider v-if="setting" class="divider thick-line"/>
     </div>
     <div class="submit-button-container">
       <el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
@@ -70,6 +70,16 @@ export default {
         type: 'success',
         message: i18n.t('settings.success')
       })
+    },
+    showMrfPolicy(key) {
+      const selectedMrfPolicies = _.get(this.settings.settings, [':pleroma', ':mrf', ':policies'])
+      const mappedPolicies = this.mrfSettings.reduce((acc, { key, related_policy }) => {
+        if (key !== ':mrf') {
+          acc[key] = related_policy
+        }
+        return acc
+      }, {})
+      return !Object.keys(mappedPolicies).includes(key) || selectedMrfPolicies.includes(mappedPolicies[key])
     }
   }
 }

From edd86b1181e174c7c5ec0b3850f9b6e621e184d0 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Wed, 22 Jul 2020 17:58:08 +0300
Subject: [PATCH 3/3] Update Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 894e7ccf..63adcd3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Remove ability to moderate users that don't have valid nickname
 - Displays both labels and description in the header of group of settiings
 - Ability to add custom values in Pleroma.Upload.Filter.Mogrify setting
+- Show only those MRF settings that have been enabled in MRF Policies setting
 
 ### Fixed