nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-27 14:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: preserve quote context when author is null or invalid

Browse Source
This commit is contained in:
exe.dev user 2026-02-27 20:15:17 +00:00
parent f9cbfa6d6c
commit b7367257b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
View File

@ -145,7 +145,6 @@ public record MessageEnvelope(
dataMessage.getProfileKey().isPresent(), dataMessage.getProfileKey().isPresent(),
dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)), dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
dataMessage.getQuote() dataMessage.getQuote()
.filter(q -> q.getAuthor() != null && q.getAuthor().isValid())
.map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)), .map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
dataMessage.getPayment().map(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null), dataMessage.getPayment().map(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null),
dataMessage.getAttachments() dataMessage.getAttachments()
@ -242,9 +241,11 @@ public record MessageEnvelope(
final AttachmentFileProvider fileProvider final AttachmentFileProvider fileProvider
) { ) {
return new Quote(quote.getId(), return new Quote(quote.getId(),
addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor())) quote.getAuthor() != null && quote.getAuthor().isValid()
.toApiRecipientAddress(), ? addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor()))
Optional.of(quote.getText()), .toApiRecipientAddress()
: new RecipientAddress(RecipientAddress.UNKNOWN_UUID),
Optional.ofNullable(quote.getText()),
quote.getMentions() == null quote.getMentions() == null
? List.of() ? List.of()
: quote.getMentions() : quote.getMentions()