Extend json output with number and uuid fields

[signal-cli] / src / main / java / org / asamk / signal / json / JsonReaction.java

diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java
index e7d40fbeb9308d3bcfd55577453338e009bcbf70..ecea15fe1ef71fa8f1ee09a88e1f89651c6172cb 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReaction.java
+++ b/src/main/java/org/asamk/signal/json/JsonReaction.java
@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage.Reaction;
 
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage.Reaction;
 

+import java.util.UUID;
+

 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 public class JsonReaction {
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
 public class JsonReaction {


@@ -13,8 +15,15 @@ public class JsonReaction {
     final String emoji;
 
     @JsonProperty
     final String emoji;
 
     @JsonProperty

+    @Deprecated

     final String targetAuthor;
 
     final String targetAuthor;
 

+    @JsonProperty
+    final String targetAuthorNumber;
+
+    @JsonProperty
+    final String targetAuthorUuid;
+

     @JsonProperty
     final long targetSentTimestamp;
 
     @JsonProperty
     final long targetSentTimestamp;
 


@@ -23,7 +32,10 @@ public class JsonReaction {
 
     JsonReaction(Reaction reaction, Manager m) {
         this.emoji = reaction.getEmoji();
 
     JsonReaction(Reaction reaction, Manager m) {
         this.emoji = reaction.getEmoji();

-        this.targetAuthor = getLegacyIdentifier(m.resolveSignalServiceAddress(reaction.getTargetAuthor()));
+        final var address = m.resolveSignalServiceAddress(reaction.getTargetAuthor());
+        this.targetAuthor = getLegacyIdentifier(address);
+        this.targetAuthorNumber = address.getNumber().orNull();
+        this.targetAuthorUuid = address.getUuid().transform(UUID::toString).orNull();

         this.targetSentTimestamp = reaction.getTargetSentTimestamp();
         this.isRemove = reaction.isRemove();
     }
         this.targetSentTimestamp = reaction.getTargetSentTimestamp();
         this.isRemove = reaction.isRemove();
     }