From a57f8bdd68ae52b4e5725fe0358dc8c7567c81ac Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 6 Feb 2019 10:18:13 -0800
Subject: [PATCH 1/4] Add option to hide filtered statuses

---
 src/boot/after_store.js              |  1 +
 src/components/settings/settings.js  |  8 ++++++++
 src/components/settings/settings.vue | 14 ++++++++++----
 src/components/status/status.js      |  5 +++++
 src/components/status/status.vue     |  2 +-
 src/i18n/en.json                     |  1 +
 src/modules/instance.js              |  1 +
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5693dcc6..c4126e4c 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -59,6 +59,7 @@ const afterStoreSetup = ({ store, i18n }) => {
           copyInstanceOption('background')
           copyInstanceOption('hidePostStats')
           copyInstanceOption('hideUserStats')
+          copyInstanceOption('hideFilteredStatuses')
           copyInstanceOption('logo')
 
           store.dispatch('setInstanceOption', {
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 8d138485..257eb691 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -27,6 +27,11 @@ const settings = {
         : user.hideUserStats,
       hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),
 
+      hideFilteredStatusesLocal: typeof user.hideFilteredStatuses === 'undefined'
+        ? instance.hideFilteredStatuses
+        : user.hideFilteredStatuses,
+      hideFilteredStatusesDefault: this.$t('settings.values.' + instance.hideFilteredStatuses),
+
       notificationVisibilityLocal: user.notificationVisibility,
       replyVisibilityLocal: user.replyVisibility,
       loopVideoLocal: user.loopVideo,
@@ -96,6 +101,9 @@ const settings = {
     hideUserStatsLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideUserStats', value })
     },
+    hideFilteredStatusesLocal (value) {
+      this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
+    },
     hideNsfwLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideNsfw', value })
     },
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 9953780f..2fa2c89c 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -205,7 +205,6 @@
                 </label>
               </li>
             </ul>
-            </label>
           </div>
           <div>
             {{$t('settings.replies_in_timeline')}}
@@ -232,11 +231,18 @@
           </div>
         </div>
         <div class="setting-item">
-          <p>{{$t('settings.filtering_explanation')}}</p>
-          <textarea id="muteWords" v-model="muteWordsString"></textarea>
+          <div>
+            <p>{{$t('settings.filtering_explanation')}}</p>
+            <textarea id="muteWords" v-model="muteWordsString"></textarea>
+          </div>
+          <div>
+            <input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal">
+            <label for="hideFilteredStatuses">
+              {{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}}
+            </label>
+          </div>
         </div>
       </div>
-
     </tab-switcher>
 </keep-alive>
   </div>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f..3403fd12 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -110,6 +110,11 @@ const Status = {
       return hits
     },
     muted () { return !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) },
+    hideFilteredStatuses () {
+      return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
+        ? this.$store.state.instance.hideFilteredStatuses
+        : this.$store.state.config.hideFilteredStatuses
+    },
     isFocused () {
       // retweet or root of an expanded conversation
       if (this.focused) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9986107f..5e7fa6c5 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="!hideReply && !deleted" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="(!hideReply && !deleted) && !(muted && hideFilteredStatuses)" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ac7cc2a7..6820203b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -139,6 +139,7 @@
     "use_one_click_nsfw": "Open NSFW attachments with just one click",
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
     "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+    "hide_filtered_statuses": "Hide filtered statuses",
     "import_followers_from_a_csv_file": "Import follows from a csv file",
     "import_theme": "Load preset",
     "inputRadius": "Input fields",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 4ad41873..ebc7732a 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -21,6 +21,7 @@ const defaultState = {
   collapseMessageWithSubject: false,
   hidePostStats: false,
   hideUserStats: false,
+  hideFilteredStatuses: true,
   disableChat: false,
   scopeCopy: true,
   subjectLineBehavior: 'email',

From fbdb7d3d9510851518fb3669ed9294210b10458c Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Wed, 6 Feb 2019 10:50:21 -0800
Subject: [PATCH 2/4] Add german translation for option label

---
 src/i18n/de.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 59449e33..d0bfba38 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -132,6 +132,7 @@
     "preload_images": "Bilder vorausladen",
     "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
     "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)",
+    "hide_filtered_statuses": "Gefilterte Beiträge verbergen",
     "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei",
     "import_theme": "Farbschema laden",
     "inputRadius": "Eingabefelder",

From 10c7365451c7820482def600ed84580c76f6b2ac Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 04:25:56 -0800
Subject: [PATCH 3/4] Add option to hide filtered statuses

---
 src/components/status/status.js  | 3 +++
 src/components/status/status.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3403fd12..4a1fcfdf 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -115,6 +115,9 @@ const Status = {
         ? this.$store.state.instance.hideFilteredStatuses
         : this.$store.state.config.hideFilteredStatuses
     },
+    hideStatus () {
+      return (!this.hideReply && !this.deleted) && !(this.muted && this.hideFilteredStatuses)
+    },
     isFocused () {
       // retweet or root of an expanded conversation
       if (this.focused) {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 5e7fa6c5..83d7b25a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="(!hideReply && !deleted) && !(muted && hideFilteredStatuses)" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>

From 7818d6786b8489ddc18a5cd0d63e894450ec5ead Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 05:17:20 -0800
Subject: [PATCH 4/4] Add option to hide filtered statuses

---
 src/components/status/status.js  | 2 +-
 src/components/status/status.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 4a1fcfdf..8181b0db 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -116,7 +116,7 @@ const Status = {
         : this.$store.state.config.hideFilteredStatuses
     },
     hideStatus () {
-      return (!this.hideReply && !this.deleted) && !(this.muted && this.hideFilteredStatuses)
+      return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses)
     },
     isFocused () {
       // retweet or root of an expanded conversation
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 83d7b25a..13e6ccec 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="status-el" v-if="hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
+  <div class="status-el" v-if="!hideStatus" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
         <small>