From f6356c972022240d88fffbfb3c348505800229df Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 28 Nov 2022 20:40:50 -0500
Subject: [PATCH] Never show stories from blocked users.

---
 .../securesms/messages/MessageContentProcessor.java         | 6 ++++++
 .../securesms/stories/landing/StoriesLandingRepository.kt   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
index 5a1df1b7da..74f8a1761c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.java
@@ -3173,6 +3173,12 @@ public final class MessageContentProcessor {
           return groupRecord.isPresent() && groupRecord.get().isAnnouncementGroup() && !groupRecord.get().getAdmins().contains(sender);
         }
       }
+    } else if (content.getStoryMessage().isPresent()) {
+      if (conversation.isGroup() && conversation.isBlocked()) {
+        return true;
+      } else {
+        return sender.isBlocked();
+      }
     }
 
     return false;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
index 40c581e95b..f365f86e10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingRepository.kt
@@ -49,7 +49,7 @@ class StoriesLandingRepository(context: Context) {
             mapping[myStories] = list + it
           }
 
-          if (!recipient.isDistributionList) {
+          if (!recipient.isDistributionList && !recipient.isBlocked) {
             val list = mapping[recipient] ?: emptyList()
             mapping[recipient] = list + it
           }