X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/62687d103fab1ade650b920008060c220361d581..HEAD:/src/main/java/org/asamk/signal/json/JsonQuote.java diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java index 01e35eb7..514f3db9 100644 --- a/src/main/java/org/asamk/signal/json/JsonQuote.java +++ b/src/main/java/org/asamk/signal/json/JsonQuote.java @@ -14,7 +14,8 @@ public record JsonQuote( String authorUuid, String text, @JsonInclude(JsonInclude.Include.NON_NULL) List mentions, - List attachments + List attachments, + @JsonInclude(JsonInclude.Include.NON_NULL) List textStyles ) { static JsonQuote from(MessageEnvelope.Data.Quote quote) { @@ -25,15 +26,20 @@ public record JsonQuote( final var authorUuid = address.uuid().map(UUID::toString).orElse(null); final var text = quote.text().orElse(null); - final var mentions = quote.mentions().size() > 0 + final var mentions = !quote.mentions().isEmpty() ? quote.mentions().stream().map(JsonMention::from).toList() : null; - final var attachments = quote.attachments().size() > 0 ? quote.attachments() + final var attachments = !quote.attachments().isEmpty() ? quote.attachments() .stream() .map(JsonQuotedAttachment::from) .toList() : List.of(); - return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments); + final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles() + .stream() + .map(JsonTextStyle::from) + .toList() : null; + + return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles); } }