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

---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/status/status.vue')

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>
-- 
cgit v1.2.3-70-g09d2


From 4dbc6a3c56c8f8b929bccb4c7bd95c178f64dccd Mon Sep 17 00:00:00 2001
From: shpuld <shp@cock.li>
Date: Wed, 6 Feb 2019 22:17:06 +0200
Subject: Fix repeater html not showing properly

---
 src/components/status/status.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/components/status/status.vue')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 9986107f..21eb4d56 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -16,9 +16,8 @@
         <UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
         <div class="media-body faint">
           <span class="user-name">
-            <router-link :to="retweeterProfileLink">
-              {{retweeterHtml || retweeter}}
-            </router-link>
+            <router-link v-if="retweeterHtml" :to="retweeterProfileLink" v-html="retweeterHtml"/>
+            <router-link v-else :to="retweeterProfileLink">{{retweeter}}</router-link>
           </span>
           <i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
           {{$t('timeline.repeated')}}
-- 
cgit v1.2.3-70-g09d2


From 10c7365451c7820482def600ed84580c76f6b2ac Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 04:25:56 -0800
Subject: 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(-)

(limited to 'src/components/status/status.vue')

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>
-- 
cgit v1.2.3-70-g09d2


From 7818d6786b8489ddc18a5cd0d63e894450ec5ead Mon Sep 17 00:00:00 2001
From: jasper <jasper92341@hotmail.com>
Date: Fri, 8 Feb 2019 05:17:20 -0800
Subject: 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(-)

(limited to 'src/components/status/status.vue')

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>
-- 
cgit v1.2.3-70-g09d2