X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e83f43065ecd7922de75ea4f9262d6f2770369b2..b178c7c67aea7bf334cbf0d54a4666af0a65b5d9:/src/main/java/org/asamk/signal/json/JsonDataMessage.java diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java index d89c7d05..74c07cd7 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -5,7 +5,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; import org.asamk.signal.manager.api.MessageEnvelope; import java.util.List; -import java.util.stream.Collectors; record JsonDataMessage( long timestamp, @@ -16,6 +15,7 @@ record JsonDataMessage( @JsonInclude(JsonInclude.Include.NON_NULL) JsonQuote quote, @JsonInclude(JsonInclude.Include.NON_NULL) JsonPayment payment, @JsonInclude(JsonInclude.Include.NON_NULL) List mentions, + @JsonInclude(JsonInclude.Include.NON_NULL) List previews, @JsonInclude(JsonInclude.Include.NON_NULL) List attachments, @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker, @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete, @@ -36,20 +36,24 @@ record JsonDataMessage( final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions() .stream() .map(JsonMention::from) - .collect(Collectors.toList()) : null; + .toList() : null; + final var previews = dataMessage.previews().size() > 0 ? dataMessage.previews() + .stream() + .map(JsonPreview::from) + .toList() : null; final var remoteDelete = dataMessage.remoteDeleteId().isPresent() ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get()) : null; final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments() .stream() .map(JsonAttachment::from) - .collect(Collectors.toList()) : null; + .toList() : null; final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null; final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts() .stream() .map(JsonSharedContact::from) - .collect(Collectors.toList()) : null; + .toList() : null; return new JsonDataMessage(timestamp, message, expiresInSeconds, @@ -58,6 +62,7 @@ record JsonDataMessage( quote, payment, mentions, + previews, attachments, sticker, remoteDelete,