From e6d91c1cf3a03e9b59826446d4a80f843d54fc6c Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sat, 22 Jun 2019 08:05:24 +0200
Subject: [PATCH] remove boosted status when the original author was blocked or
 muted (#1335)

---
 .../com/keylesspalace/tusky/fragment/TimelineFragment.java     | 3 ++-
 .../com/keylesspalace/tusky/fragment/ViewThreadFragment.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index ac151f1a..6764911b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -870,7 +870,8 @@ public class TimelineFragment extends SFragment implements
         Iterator<Either<Placeholder, Status>> iterator = statuses.iterator();
         while (iterator.hasNext()) {
             Status status = iterator.next().asRightOrNull();
-            if (status != null && status.getAccount().getId().equals(accountId)) {
+            if (status != null &&
+                    (status.getAccount().getId().equals(accountId) || status.getActionableStatus().getAccount().getId().equals(accountId))) {
                 iterator.remove();
             }
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index fb61c4fe..5be15a94 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -421,7 +421,7 @@ public final class ViewThreadFragment extends SFragment implements
         Iterator<Status> iterator = statuses.iterator();
         while (iterator.hasNext()) {
             Status s = iterator.next();
-            if (s.getAccount().getId().equals(accountId)) {
+            if (s.getAccount().getId().equals(accountId) || s.getActionableStatus().getAccount().getId().equals(accountId)) {
                 iterator.remove();
             }
         }