Fix error type for dbus rate limit challenge

[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 d253b197e5a43c700409adc0aab05010cf914669..805c32c88a72d684727aee6234a8695552d5fa35 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,21 +1,36 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+
 import org.asamk.Signal;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+import java.util.UUID;
 
-class JsonSyncDataMessage extends JsonDataMessage {
+record JsonSyncDataMessage(
+        @Deprecated String destination,
+        String destinationNumber,
+        String destinationUuid,
+        @JsonUnwrapped JsonDataMessage dataMessage
+) {
 
-    String destination;
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
+        if (transcriptMessage.destination().isPresent()) {
+            final var address = transcriptMessage.destination().get();
+            return new JsonSyncDataMessage(address.getLegacyIdentifier(),
+                    address.getNumber().orElse(null),
+                    address.getUuid().map(UUID::toString).orElse(null),
+                    JsonDataMessage.from(transcriptMessage.message()));
 
-    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage) {
-        super(transcriptMessage.getMessage());
-        if (transcriptMessage.getDestination().isPresent()) {
-            this.destination = transcriptMessage.getDestination().get().getNumber().get();
+        } else {
+            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.message()));
         }
     }
 
-    JsonSyncDataMessage(Signal.SyncMessageReceived messageReceived) {
-        super(messageReceived);
-        destination = messageReceived.getDestination();
+    static JsonSyncDataMessage from(Signal.SyncMessageReceived messageReceived) {
+        return new JsonSyncDataMessage(messageReceived.getDestination(),
+                null,
+                null,
+                JsonDataMessage.from(messageReceived));
     }
 }