add group info on json message

[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 805c32c88a72d684727aee6234a8695552d5fa35..391181b03aac4bee7789193598ced55191a08271 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

+import com.fasterxml.jackson.annotation.JsonInclude;

 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 

-import org.asamk.Signal;
+import org.asamk.signal.manager.Manager;

 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.MessageEnvelope;

+import org.asamk.signal.manager.api.RecipientAddress;

 
 import java.util.UUID;
 
 
 import java.util.UUID;
 


@@ -11,26 +13,21 @@ record JsonSyncDataMessage(
         @Deprecated String destination,
         String destinationNumber,
         String destinationUuid,
         @Deprecated String destination,
         String destinationNumber,
         String destinationUuid,

+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,

         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
         @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.getNumber().orElse(null),
-                    address.getUuid().map(UUID::toString).orElse(null),
-                    JsonDataMessage.from(transcriptMessage.message()));
-
-        } else {
-            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.message()));
-        }
-    }
-
-    static JsonSyncDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonSyncDataMessage(messageReceived.getDestination(),
-                null,
-                null,
-                JsonDataMessage.from(messageReceived));
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage, Manager m) {
+        return new JsonSyncDataMessage(transcriptMessage.destination()
+                .map(RecipientAddress::getLegacyIdentifier)
+                .orElse(null),
+                transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
+                transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
+                transcriptMessage.editMessage()
+                    .map(data -> JsonEditMessage.from(data, m))
+                    .orElse(null),
+                transcriptMessage.message()
+                    .map(data -> JsonDataMessage.from(data, m))
+                    .orElse(null));

     }
 }
     }
 }