From b7367257b7718b2b5c7c14d9cc39abc972714b5c Mon Sep 17 00:00:00 2001 From: "exe.dev user" Date: Fri, 27 Feb 2026 20:15:17 +0000 Subject: [PATCH] Fix: preserve quote context when author is null or invalid --- .../org/asamk/signal/manager/api/MessageEnvelope.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java index 37946057..b8f0eea5 100644 --- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java +++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java @@ -145,7 +145,6 @@ public record MessageEnvelope( dataMessage.getProfileKey().isPresent(), dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)), dataMessage.getQuote() - .filter(q -> q.getAuthor() != null && q.getAuthor().isValid()) .map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)), dataMessage.getPayment().map(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null), dataMessage.getAttachments() @@ -242,9 +241,11 @@ public record MessageEnvelope( final AttachmentFileProvider fileProvider ) { return new Quote(quote.getId(), - addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor())) - .toApiRecipientAddress(), - Optional.of(quote.getText()), + quote.getAuthor() != null && quote.getAuthor().isValid() + ? addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor())) + .toApiRecipientAddress() + : new RecipientAddress(RecipientAddress.UNKNOWN_UUID), + Optional.ofNullable(quote.getText()), quote.getMentions() == null ? List.of() : quote.getMentions()