pleroma-fe

commit: 48d648370032ae4a3e35b8f7f9a531d43f8b8ab5
parent: 5f65520287d0565b48209a44163bc62327a1bd8e
Author: Henry <spam@hjkos.com>
Date:   Sun, 21 Oct 2018 21:01:22 +0000

Merge branch 'instance-setting-fallback' into 'develop'

Fall back to instance settings consistently

See merge request pleroma/pleroma-fe!361
Diffstat:
M
src/components/status/status.js
15
+++++++++++----
M
src/modules/config.js
2
+-

2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
@@ -31,10 +31,17 @@ const Status = {
       preview: null,
       showPreview: false,
       showingTall: false,
-      expandingSubject: !this.$store.state.config.collapseMessageWithSubject
+      expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
+        ? !this.$store.state.instance.collapseMessageWithSubject
+        : !this.$store.state.config.collapseMessageWithSubject
     }
   },
   computed: {
+    localCollapseSubjectDefault () {
+      return typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
+        ? this.$store.state.instance.collapseMessageWithSubject
+        : this.$store.state.config.collapseMessageWithSubject
+    },
     muteWords () {
       return this.$store.state.config.muteWords
     },
@@ -147,13 +154,13 @@ const Status = {
       return this.status.attentions.length > 0
     },
     hideSubjectStatus () {
-      if (this.tallStatus && !this.$store.state.config.collapseMessageWithSubject) {
+      if (this.tallStatus && !this.localCollapseSubjectDefault) {
         return false
       }
       return !this.expandingSubject && this.status.summary
     },
     hideTallStatus () {
-      if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) {
+      if (this.status.summary && this.localCollapseSubjectDefault) {
         return false
       }
       if (this.showingTall) {
@@ -168,7 +175,7 @@ const Status = {
       if (!this.status.nsfw) {
         return false
       }
-      if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) {
+      if (this.status.summary && this.localCollapseSubjectDefault) {
         return false
       }
       return true
diff --git a/src/modules/config.js b/src/modules/config.js
@@ -5,7 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
 const defaultState = {
   colors: {},
-  collapseMessageWithSubject: false,
+  collapseMessageWithSubject: undefined,
   hideAttachments: false,
   hideAttachmentsInConv: false,
   hideNsfw: true,