X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/46a4c2c0d0a36b7f230fc2c2d47aa371a6e02d35..ca52c0103136bc1f0cb140c33e81ff17d47aec2e:/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 b6243041..f0c66d00 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -6,11 +6,22 @@ import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
+import java.util.UUID;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
 public class JsonMention {
 
     @JsonProperty
+    @Deprecated
     final String name;
 
+    @JsonProperty
+    final String number;
+
+    @JsonProperty
+    final String uuid;
+
     @JsonProperty
     final int start;
 
@@ -18,8 +29,10 @@ public class JsonMention {
     final int length;
 
     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(), null));
+        this.name = getLegacyIdentifier(address);
+        this.number = address.getNumber().orNull();
+        this.uuid = address.getUuid().transform(UUID::toString).orNull();
         this.start = mention.getStart();
         this.length = mention.getLength();
     }