Extend json output with number and uuid fields

[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 0fe78bc2b75f5efd3b1be3318666ff82a8cad238..f0c66d00867c3df9b3cb945aab446dabe5127364 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -6,13 +6,22 @@ import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 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
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 public class JsonMention {
 
     @JsonProperty

+    @Deprecated

     final String name;
 
     final String name;
 

+    @JsonProperty
+    final String number;
+
+    @JsonProperty
+    final String uuid;
+

     @JsonProperty
     final int start;
 
     @JsonProperty
     final int start;
 


@@ -20,8 +29,10 @@ public class JsonMention {
     final int length;
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
     final int length;
 
     JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {

-        this.name = getLegacyIdentifier(m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(),
-                null)));
+        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();
     }
         this.start = mention.getStart();
         this.length = mention.getLength();
     }