X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/46a4c2c0d0a36b7f230fc2c2d47aa371a6e02d35..19b15e68e4ec652e23f9625662b7c0f96b963029:/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 d65b0672..50c6ecee 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
@@ -1,17 +1,19 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
-class JsonSyncReadMessage {
+import java.util.UUID;
 
-    @JsonProperty
-    final String sender;
+record JsonSyncReadMessage(
+        @Deprecated String sender, String senderNumber, String senderUuid, long timestamp
+) {
 
-    @JsonProperty
-    final long timestamp;
-
-    public JsonSyncReadMessage(final String sender, final long timestamp) {
-        this.sender = sender;
-        this.timestamp = timestamp;
+    static JsonSyncReadMessage from(MessageEnvelope.Sync.Read readMessage) {
+        final var senderAddress = readMessage.sender();
+        final var sender = senderAddress.getLegacyIdentifier();
+        final var senderNumber = senderAddress.number().orElse(null);
+        final var senderUuid = senderAddress.uuid().map(UUID::toString).orElse(null);
+        final var timestamp = readMessage.timestamp();
+        return new JsonSyncReadMessage(sender, senderNumber, senderUuid, timestamp);
     }
 }