X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..24069c8277cca7f8e94aa3f083980e85dca25269:/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 f5d70d28..bafa97e7 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -2,17 +2,13 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.UntrustedIdentityException;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
-import org.whispersystems.signalservice.api.messages.SignalServiceContent;
-import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.asamk.signal.manager.api.UntrustedIdentityException;
 
-import java.util.List;
-
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
+import java.util.UUID;
 
 public record JsonMessageEnvelope(
         @Deprecated String source,
@@ -22,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,
@@ -29,64 +27,45 @@ public record JsonMessageEnvelope(
 ) {
 
     public static JsonMessageEnvelope from(
-            SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception, Manager m
+            MessageEnvelope envelope, Throwable exception, Manager m
     ) {
-        final String source;
-        final String sourceNumber;
-        final String sourceUuid;
+        final RecipientAddress sourceAddress;
         final Integer sourceDevice;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            final var sourceAddress = m.resolveSignalServiceAddress(envelope.getSourceAddress());
-            source = getLegacyIdentifier(sourceAddress);
-            sourceNumber = sourceAddress.getNumber().orNull();
-            sourceUuid = sourceAddress.getUuid().toString();
-            sourceDevice = envelope.getSourceDevice();
-        } else if (envelope.isUnidentifiedSender() && content != null) {
-            final var sender = m.resolveSignalServiceAddress(content.getSender());
-            source = getLegacyIdentifier(sender);
-            sourceNumber = sender.getNumber().orNull();
-            sourceUuid = sender.getUuid().toString();
-            sourceDevice = content.getSenderDevice();
+        if (envelope.sourceAddress().isPresent()) {
+            sourceAddress = envelope.sourceAddress().get();
+            sourceDevice = envelope.sourceDevice();
         } else if (exception instanceof UntrustedIdentityException e) {
-            final var sender = m.resolveSignalServiceAddress(e.getSender());
-            source = getLegacyIdentifier(sender);
-            sourceNumber = sender.getNumber().orNull();
-            sourceUuid = sender.getUuid().toString();
+            sourceAddress = e.getSender();
             sourceDevice = e.getSenderDevice();
         } else {
-            source = null;
-            sourceNumber = null;
-            sourceUuid = null;
+            sourceAddress = null;
             sourceDevice = null;
         }
-        String name;
-        try {
-            name = m.getContactOrProfileName(RecipientIdentifier.Single.fromString(source, m.getSelfNumber()));
-        } catch (InvalidNumberException | NullPointerException e) {
-            name = null;
-        }
-        final var sourceName = name;
-        final var timestamp = envelope.getTimestamp();
-        final JsonReceiptMessage receiptMessage;
-        if (envelope.isReceipt()) {
-            receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
-        } else if (content != null && content.getReceiptMessage().isPresent()) {
-            receiptMessage = JsonReceiptMessage.from(content.getReceiptMessage().get());
+
+        final String source;
+        final String sourceNumber;
+        final String sourceUuid;
+        final String sourceName;
+        if (sourceAddress != null) {
+            source = sourceAddress.getLegacyIdentifier();
+            sourceNumber = sourceAddress.number().orElse(null);
+            sourceUuid = sourceAddress.uuid().map(UUID::toString).orElse(null);
+            sourceName = m.getContactOrProfileName(RecipientIdentifier.Single.fromAddress(sourceAddress));
         } else {
-            receiptMessage = null;
+            source = null;
+            sourceNumber = null;
+            sourceUuid = null;
+            sourceName = null;
         }
-        final var typingMessage = content != null && content.getTypingMessage().isPresent() ? JsonTypingMessage.from(
-                content.getTypingMessage().get()) : null;
+        final var timestamp = envelope.timestamp();
+        final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
+        final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
-        final var dataMessage = content != null && content.getDataMessage().isPresent()
-                ? JsonDataMessage.from(content.getDataMessage().get(), m)
-                : null;
-        final var syncMessage = content != null && content.getSyncMessage().isPresent()
-                ? JsonSyncMessage.from(content.getSyncMessage().get(), m)
-                : null;
-        final var callMessage = content != null && content.getCallMessage().isPresent()
-                ? JsonCallMessage.from(content.getCallMessage().get())
-                : 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);
 
         return new JsonMessageEnvelope(source,
                 sourceNumber,
@@ -95,52 +74,11 @@ public record JsonMessageEnvelope(
                 sourceDevice,
                 timestamp,
                 dataMessage,
+                editMessage,
+                storyMessage,
                 syncMessage,
                 callMessage,
                 receiptMessage,
                 typingMessage);
     }
-
-    public static JsonMessageEnvelope from(Signal.MessageReceived messageReceived) {
-        return new JsonMessageEnvelope(messageReceived.getSource(),
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getTimestamp(),
-                JsonDataMessage.from(messageReceived),
-                null,
-                null,
-                null,
-                null);
-    }
-
-    public static JsonMessageEnvelope from(Signal.ReceiptReceived receiptReceived) {
-        return new JsonMessageEnvelope(receiptReceived.getSender(),
-                null,
-                null,
-                null,
-                null,
-                receiptReceived.getTimestamp(),
-                null,
-                null,
-                null,
-                JsonReceiptMessage.deliveryReceipt(receiptReceived.getTimestamp(),
-                        List.of(receiptReceived.getTimestamp())),
-                null);
-    }
-
-    public static JsonMessageEnvelope from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonMessageEnvelope(messageReceived.getSource(),
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getTimestamp(),
-                null,
-                JsonSyncMessage.from(messageReceived),
-                null,
-                null,
-                null);
-    }
 }