update deliveryReceipt to conform

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

diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java
index 302128eda41c3fdce47ef5a6597951228b95ace5..3c6f2eec091333721bd85ee12dd08dcafc547d35 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -1,18 +1,36 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

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

 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 

+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+

 public class JsonMention {
 
 public class JsonMention {
 

-    String name;
-    int start;
-    int length;
+    @JsonProperty
+    @Deprecated
+    final String name;
+
+    @JsonProperty
+    final String number;
+
+    @JsonProperty
+    final String uuid;
+
+    @JsonProperty
+    final int start;
+
+    @JsonProperty
+    final int length;

 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {

-        this.name = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null))
-                .getLegacyIdentifier();
+        final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid()));
+        this.name = getLegacyIdentifier(address);
+        this.number = address.getNumber().orNull();
+        this.uuid = address.getUuid().toString();

         this.start = mention.getStart();
         this.length = mention.getLength();
     }
         this.start = mention.getStart();
         this.length = mention.getLength();
     }