X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/67f62947c6d4cc5f4b9d4334bfe55b753bc6a12c..43bcc95713f14bdf6103d63d2daed66c3e7df502:/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 302128ed..b24768b7 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -1,18 +1,35 @@
 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 static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 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) {
-        this.name = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(), null))
-                .getLegacyIdentifier();
+        final var address = m.resolveSignalServiceAddress(mention.getUuid());
+        this.name = getLegacyIdentifier(address);
+        this.number = address.getNumber().orNull();
+        this.uuid = address.getUuid().toString();
         this.start = mention.getStart();
         this.length = mention.getLength();
     }