Merge branch 'fix-excessive-reregistrations' into 'develop'

Fix rogue nested watcher triggering notifications registering too often

Closes #1159

See merge request pleroma/pleroma-fe!1708

2 files changed, 6 insertions, 9 deletions

diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index dc832044..2e6992cb 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -41,7 +41,13 @@ export default {
   },
   methods: {
     update (e) {
+      const [firstSegment, ...rest] = this.path.split('.')
       set(this.$parent, this.path, e)
+      // Updating nested properties does not trigger update on its parent.
+      // probably still not as reliable, but works for depth=1 at least
+      if (rest.length > 0) {
+        set(this.$parent, firstSegment, { ...get(this.$parent, firstSegment) })
+      }
     },
     reset () {
       set(this.$parent, this.path, this.defaultState)
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 73413b48..5354e5db 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -38,15 +38,6 @@ const FilteringTab = {
   },
   // Updating nested properties
   watch: {
-    notificationVisibility: {
-      handler (value) {
-        this.$store.dispatch('setOption', {
-          name: 'notificationVisibility',
-          value: this.$store.getters.mergedConfig.notificationVisibility
-        })
-      },
-      deep: true
-    },
     replyVisibility () {
       this.$store.dispatch('queueFlushAll')
     }