Change meaning of -v flag from --version to --verbose

[signal-cli] / src / main / java / org / asamk / signal / json / JsonSyncDataMessage.java

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index 28c9d9369403a41fdd95d87bea0a082e21e2594f..fc84b0887ef75bf9e82393a94f8a8144b44facc5 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,46 +1,31 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
-import org.asamk.Signal;
-import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
+record JsonSyncDataMessage(
+        @Deprecated String destination,
+        String destinationNumber,
+        String destinationUuid,
+        @JsonUnwrapped JsonDataMessage dataMessage
+) {
+
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
+        if (transcriptMessage.destination().isPresent()) {
+            final var address = transcriptMessage.destination().get();
+            return new JsonSyncDataMessage(address.getLegacyIdentifier(),
+                    address.number().orElse(null),
+                    address.uuid().map(UUID::toString).orElse(null),
+                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
 
-class JsonSyncDataMessage extends JsonDataMessage {
-
-    @JsonProperty
-    @Deprecated
-    final String destination;
-
-    @JsonProperty
-    final String destinationNumber;
-
-    @JsonProperty
-    final String destinationUuid;
-
-    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
-        super(transcriptMessage.getMessage(), m);
-
-        if (transcriptMessage.getDestination().isPresent()) {
-            final var address = transcriptMessage.getDestination().get();
-            this.destination = getLegacyIdentifier(address);
-            this.destinationNumber = address.getNumber().orNull();
-            this.destinationUuid = address.getUuid().transform(UUID::toString).orNull();
         } else {
-            this.destination = null;
-            this.destinationNumber = null;
-            this.destinationUuid = null;
+            return new JsonSyncDataMessage(null,
+                    null,
+                    null,
+                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
         }
     }
-
-    JsonSyncDataMessage(Signal.SyncMessageReceived messageReceived) {
-        super(messageReceived);
-        this.destination = messageReceived.getDestination();
-        this.destinationNumber = null;
-        this.destinationUuid = null;
-    }
 }