From c5e2c8ac2b21ea2ce4e95a289ee343eeaa53995e Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Wed, 29 May 2024 20:24:49 -0500
Subject: [PATCH] Ignore MAM messages from blocked

To avoid popping up the conversation again when we've blocked them
---
 .../java/eu/siacs/conversations/parser/MessageParser.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 88c63628fe221a4893a658cb61a9a57373fa11bb..5aa5acbf11b86a525c17e98e0d9f0e1cfb6ec2bf 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -433,6 +433,11 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
             if (handleErrorMessage(account, packet)) {
                 return;
             }
+            final var contact = account.getRoster().getContact(packet.getFrom());
+            if (contact.isBlocked()) {
+                Log.d(Config.LOGTAG, "Got MAM result from blocked contact, ignoring...");
+                return;
+            }
         } else if (query != null) {
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received mam result with invalid from (" + original.getFrom() + ") or queryId (" + queryId + ")");
             return;