X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/30690785fd51f9ba841f6f57d5f403bd970f26e3..8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6:/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 e7d40fbe..cc80ee84 100644 --- a/src/main/java/org/asamk/signal/json/JsonReaction.java +++ b/src/main/java/org/asamk/signal/json/JsonReaction.java @@ -13,8 +13,15 @@ public class JsonReaction { final String emoji; @JsonProperty + @Deprecated final String targetAuthor; + @JsonProperty + final String targetAuthorNumber; + + @JsonProperty + final String targetAuthorUuid; + @JsonProperty final long targetSentTimestamp; @@ -23,7 +30,10 @@ public class JsonReaction { 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().toString(); this.targetSentTimestamp = reaction.getTargetSentTimestamp(); this.isRemove = reaction.isRemove(); }