From d6ad08050ad0cfcf5ed4a94b5b2e8c66ef27ca0a Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Sun, 21 Oct 2018 18:04:23 +0100
Subject: [PATCH 1/2] Fall back to instance settings consistently

---
 src/components/status/status.js | 15 +++++++++++----
 src/modules/config.js           |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 45f5ccac78..f1afcac717 100644
--- 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
index 375d016796..1c04845a85 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -5,7 +5,6 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
 const defaultState = {
   colors: {},
-  collapseMessageWithSubject: false,
   hideAttachments: false,
   hideAttachmentsInConv: false,
   hideNsfw: true,

From c02a9089e13ee7acf5a56818ac807dcb813aa43a Mon Sep 17 00:00:00 2001
From: scarlett <nia@netbsd.org>
Date: Sun, 21 Oct 2018 19:42:38 +0100
Subject: [PATCH 2/2] explicitly set collapseMessageWithSubject to undefined

---
 src/modules/config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/config.js b/src/modules/config.js
index 1c04845a85..522940f6b4 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -5,6 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0]
 
 const defaultState = {
   colors: {},
+  collapseMessageWithSubject: undefined,
   hideAttachments: false,
   hideAttachmentsInConv: false,
   hideNsfw: true,