X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/46a4c2c0d0a36b7f230fc2c2d47aa371a6e02d35..9eeba88bd05bfcf58632f1951dc52df58e58cc6d:/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 e755acad..1c927b40 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -24,6 +24,10 @@ class JsonDataMessage { @JsonProperty final Integer expiresInSeconds; + @JsonProperty + @JsonInclude(JsonInclude.Include.NON_NULL) + final Boolean viewOnce; + @JsonProperty @JsonInclude(JsonInclude.Include.NON_NULL) final JsonReaction reaction; @@ -44,6 +48,10 @@ class JsonDataMessage { @JsonInclude(JsonInclude.Include.NON_NULL) final JsonSticker sticker; + @JsonProperty + @JsonInclude(JsonInclude.Include.NON_NULL) + final JsonRemoteDelete remoteDelete; + @JsonProperty @JsonInclude(JsonInclude.Include.NON_NULL) final JsonGroupInfo groupInfo; @@ -66,6 +74,7 @@ class JsonDataMessage { } this.message = dataMessage.getBody().orNull(); this.expiresInSeconds = dataMessage.getExpiresInSeconds(); + this.viewOnce = dataMessage.isViewOnce(); this.reaction = dataMessage.getReaction().isPresent() ? new JsonReaction(dataMessage.getReaction().get(), m) : null; @@ -79,6 +88,8 @@ class JsonDataMessage { } else { this.mentions = List.of(); } + remoteDelete = dataMessage.getRemoteDelete().isPresent() ? new JsonRemoteDelete(dataMessage.getRemoteDelete() + .get()) : null; if (dataMessage.getAttachments().isPresent()) { this.attachments = dataMessage.getAttachments() .get() @@ -96,6 +107,8 @@ class JsonDataMessage { message = messageReceived.getMessage(); groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null; expiresInSeconds = null; + viewOnce = null; + remoteDelete = null; reaction = null; // TODO Replace these 4 with the proper commands quote = null; mentions = null; @@ -108,6 +121,8 @@ class JsonDataMessage { message = messageReceived.getMessage(); groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null; expiresInSeconds = null; + viewOnce = null; + remoteDelete = null; reaction = null; // TODO Replace these 4 with the proper commands quote = null; mentions = null;