X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/a593051512b716ed3cc42a1a7b69d49a459352ed..e4c5144fbf46cc91a38f5011118e6008db894a80:/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 5511f531..ef742585 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -20,6 +20,7 @@ record JsonDataMessage( @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker, @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete, @JsonInclude(JsonInclude.Include.NON_NULL) List contacts, + @JsonInclude(JsonInclude.Include.NON_NULL) List textStyles, @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo, @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryContext storyContext ) { @@ -37,27 +38,31 @@ record JsonDataMessage( final var reaction = dataMessage.reaction().map(JsonReaction::from).orElse(null); final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null; final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null; - final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions() + final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions() .stream() .map(JsonMention::from) .toList() : null; - final var previews = dataMessage.previews().size() > 0 ? dataMessage.previews() + final var previews = !dataMessage.previews().isEmpty() ? 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() + final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments() .stream() .map(JsonAttachment::from) .toList() : null; final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null; - - final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts() + final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts() .stream() .map(JsonSharedContact::from) .toList() : null; + final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles() + .stream() + .map(JsonTextStyle::from) + .toList() : null; + return new JsonDataMessage(timestamp, message, expiresInSeconds, @@ -71,6 +76,7 @@ record JsonDataMessage( sticker, remoteDelete, contacts, + textStyles, groupInfo, storyContext); }