Add new dbus message received signals with extendable extras map

[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 806838420d49d244e197a7cd130e7481c35b59bc..66fcc1f1a72e725764d593d6c67d5177d2dc412f 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -4,19 +4,16 @@ import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
-public class JsonMention {
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
-    String name;
-    int start;
-    int length;
-
-    JsonMention(SignalServiceDataMessage.Mention mention, Manager m) {
-        this.name = m.resolveSignalServiceAddress(
-                new SignalServiceAddress(mention.getUuid(), null)
-        ).getLegacyIdentifier();
-        this.start = mention.getStart();
-        this.length = mention.getLength();
+public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) {
 
+    static JsonMention from(SignalServiceDataMessage.Mention mention, Manager m) {
+        final var address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid()));
+        return new JsonMention(getLegacyIdentifier(address),
+                address.getNumber().orNull(),
+                address.getUuid().toString(),
+                mention.getStart(),
+                mention.getLength());
     }
-
 }