X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..30e8e36635733b3e8c75a44e95785ba33cf55e61:/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 66fcc1f1..c4c962a0 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -1,19 +1,17 @@
 package org.asamk.signal.json;
 
-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.api.MessageEnvelope;
 
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
+import java.util.UUID;
 
 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());
+    static JsonMention from(MessageEnvelope.Data.Mention mention) {
+        final var address = mention.recipient();
+        return new JsonMention(address.getLegacyIdentifier(),
+                address.number().orElse(null),
+                address.uuid().map(UUID::toString).orElse(null),
+                mention.start(),
+                mention.length());
     }
 }