Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'

#254 Add option to hide filtered statuses

See merge request pleroma/pleroma-fe!539

1 files changed, 8 insertions, 0 deletions

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 65ddcb9f..8181b0db 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -110,6 +110,14 @@ 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
+    },
+    hideStatus () {
+      return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses)
+    },
     isFocused () {
       // retweet or root of an expanded conversation
       if (this.focused) {