X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/3c2fa65e05ee6e57e88edb947385e0858f205949..19b15e68e4ec652e23f9625662b7c0f96b963029:/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 18207747..bafa97e7 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -4,9 +4,9 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.UUID;
 
@@ -18,6 +18,8 @@ public record JsonMessageEnvelope(
         Integer sourceDevice,
         long timestamp,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessage syncMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonCallMessage callMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReceiptMessage receiptMessage,
@@ -60,6 +62,8 @@ public record JsonMessageEnvelope(
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
         final var dataMessage = envelope.data().map(JsonDataMessage::from).orElse(null);
+        final var editMessage = envelope.edit().map(JsonEditMessage::from).orElse(null);
+        final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
         final var syncMessage = envelope.sync().map(JsonSyncMessage::from).orElse(null);
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
@@ -70,6 +74,8 @@ public record JsonMessageEnvelope(
                 sourceDevice,
                 timestamp,
                 dataMessage,
+                editMessage,
+                storyMessage,
                 syncMessage,
                 callMessage,
                 receiptMessage,