Extend json output with number and uuid fields

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
index d65b0672097770a2af54333dde56d34a6cf85958..df307b45cbb10f0a9abcc5ff382254e788913b7e 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
@@ -2,16 +2,32 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
+
+import java.util.UUID;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
 class JsonSyncReadMessage {
 
     @JsonProperty
+    @Deprecated
     final String sender;
 
+    @JsonProperty
+    final String senderNumber;
+
+    @JsonProperty
+    final String senderUuid;
+
     @JsonProperty
     final long timestamp;
 
-    public JsonSyncReadMessage(final String sender, final long timestamp) {
-        this.sender = sender;
-        this.timestamp = timestamp;
+    public JsonSyncReadMessage(final ReadMessage readMessage) {
+        final var sender = readMessage.getSender();
+        this.sender = getLegacyIdentifier(sender);
+        this.senderNumber = sender.getNumber().orNull();
+        this.senderUuid = sender.getUuid().transform(UUID::toString).orNull();
+        this.timestamp = readMessage.getTimestamp();
     }
 }