From 1de0bbd4f7459816759d877b39c142b1280007d1 Mon Sep 17 00:00:00 2001 From: david-harley Date: Tue, 22 Dec 2020 15:05:35 +1030 Subject: [PATCH] Added support for quotes, mentions and reactions in non-daemon JSON output --- .../signal/JsonReceiveMessageHandler.java | 2 +- .../org/asamk/signal/json/JsonAttachment.java | 14 ++++++++ .../asamk/signal/json/JsonDataMessage.java | 34 ++++++++++++++++++- .../org/asamk/signal/json/JsonGroupInfo.java | 1 + .../org/asamk/signal/json/JsonMention.java | 18 ++++++++++ .../signal/json/JsonMessageEnvelope.java | 9 +++-- .../java/org/asamk/signal/json/JsonQuote.java | 34 +++++++++++++++++++ .../org/asamk/signal/json/JsonReaction.java | 19 +++++++++++ .../signal/json/JsonSyncDataMessage.java | 5 +-- .../asamk/signal/json/JsonSyncMessage.java | 5 +-- 10 files changed, 132 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/asamk/signal/json/JsonMention.java create mode 100644 src/main/java/org/asamk/signal/json/JsonQuote.java create mode 100644 src/main/java/org/asamk/signal/json/JsonReaction.java diff --git a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java index dfe51fe7..363fc304 100644 --- a/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java +++ b/src/main/java/org/asamk/signal/JsonReceiveMessageHandler.java @@ -35,7 +35,7 @@ public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler result.putPOJO("error", new JsonError(exception)); } if (envelope != null) { - result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content)); + result.putPOJO("envelope", new JsonMessageEnvelope(envelope, content, m)); } try { jsonProcessor.writeValue(System.out, result); diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java index 1949171a..a25482cf 100644 --- a/src/main/java/org/asamk/signal/json/JsonAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java @@ -25,6 +25,20 @@ class JsonAttachment { } } + // Used for the quoted attachments + JsonAttachment(SignalServiceAttachment attachment, String filename) { + this.contentType = attachment.getContentType(); + + final SignalServiceAttachmentPointer pointer = attachment.asPointer(); + if (attachment.isPointer()) { + this.id = String.valueOf(pointer.getRemoteId()); + this.filename = filename; + if (pointer.getSize().isPresent()) { + this.size = pointer.getSize().get(); + } + } + } + JsonAttachment(String filename) { this.filename = filename; } diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java index 653a59e6..379a219b 100644 --- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java @@ -1,6 +1,7 @@ package org.asamk.signal.json; import org.asamk.Signal; +import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.messages.SignalServiceAttachment; import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; import org.whispersystems.signalservice.api.messages.SignalServiceGroup; @@ -15,10 +16,14 @@ class JsonDataMessage { long timestamp; String message; int expiresInSeconds; + + JsonReaction reaction; + JsonQuote quote; + List mentions; List attachments; JsonGroupInfo groupInfo; - JsonDataMessage(SignalServiceDataMessage dataMessage) { + JsonDataMessage(SignalServiceDataMessage dataMessage, final Manager m) { this.timestamp = dataMessage.getTimestamp(); if (dataMessage.getGroupContext().isPresent()) { if (dataMessage.getGroupContext().get().getGroupV1().isPresent()) { @@ -33,6 +38,27 @@ class JsonDataMessage { this.message = dataMessage.getBody().get(); } this.expiresInSeconds = dataMessage.getExpiresInSeconds(); + if (dataMessage.getReaction().isPresent()) { + if(m == null){ + System.out.println("ERROR, MANAGER NOT SET"); + } + else { + this.reaction = new JsonReaction(dataMessage.getReaction().get(), m); + } + } + if (dataMessage.getQuote().isPresent()) { + this.quote = new JsonQuote(dataMessage.getQuote().get()); + } else { + this.quote = null; + } + if (dataMessage.getMentions().isPresent()) { + this.mentions = new ArrayList<>(dataMessage.getMentions().get().size()); + for (SignalServiceDataMessage.Mention mention : dataMessage.getMentions().get()) { + this.mentions.add(new JsonMention(mention)); + } + } else { + this.mentions = new ArrayList<>(); + } if (dataMessage.getAttachments().isPresent()) { this.attachments = new ArrayList<>(dataMessage.getAttachments().get().size()); for (SignalServiceAttachment attachment : dataMessage.getAttachments().get()) { @@ -47,6 +73,9 @@ class JsonDataMessage { timestamp = messageReceived.getTimestamp(); message = messageReceived.getMessage(); groupInfo = new JsonGroupInfo(messageReceived.getGroupId()); + reaction = null; // TEMP until I understand how to do this + quote = null; + mentions = null; attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList()); } @@ -54,6 +83,9 @@ class JsonDataMessage { timestamp = messageReceived.getTimestamp(); message = messageReceived.getMessage(); groupInfo = new JsonGroupInfo(messageReceived.getGroupId()); + reaction = null; // TEMP until I understand how to do this + quote = null; + mentions = null; attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList()); } } diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java index 970cde52..1659a863 100644 --- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java +++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java @@ -32,6 +32,7 @@ class JsonGroupInfo { JsonGroupInfo(SignalServiceGroupV2 groupInfo) { this.groupId = Base64.encodeBytes(GroupUtils.getGroupId(groupInfo.getMasterKey())); + // TODO populate members and name fields this.type = groupInfo.hasSignedGroupChange() ? "UPDATE" : "DELIVER"; } diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java new file mode 100644 index 00000000..6a176c16 --- /dev/null +++ b/src/main/java/org/asamk/signal/json/JsonMention.java @@ -0,0 +1,18 @@ +package org.asamk.signal.json; + +import java.util.UUID; +import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; + +public class JsonMention { + + UUID uuid; // If possible, it would be nice to resolve this into their phone-number/name. Same for plain-text output + int start; + int length; + + JsonMention(SignalServiceDataMessage.Mention mention){ + this.uuid = mention.getUuid(); + this.start = mention.getStart(); + this.length = mention.getLength(); + } + +} diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java index 5e5e6a33..d92c50e5 100644 --- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java +++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java @@ -1,6 +1,7 @@ package org.asamk.signal.json; import org.asamk.Signal; +import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.messages.SignalServiceContent; import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; import org.whispersystems.signalservice.api.push.SignalServiceAddress; @@ -18,7 +19,9 @@ public class JsonMessageEnvelope { JsonCallMessage callMessage; JsonReceiptMessage receiptMessage; - public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) { + public JsonMessageEnvelope( + SignalServiceEnvelope envelope, SignalServiceContent content, final Manager m + ) { if (!envelope.isUnidentifiedSender() && envelope.hasSource()) { SignalServiceAddress source = envelope.getSourceAddress(); this.source = source.getLegacyIdentifier(); @@ -35,10 +38,10 @@ public class JsonMessageEnvelope { this.sourceDevice = content.getSenderDevice(); } if (content.getDataMessage().isPresent()) { - this.dataMessage = new JsonDataMessage(content.getDataMessage().get()); + this.dataMessage = new JsonDataMessage(content.getDataMessage().get(), m); } if (content.getSyncMessage().isPresent()) { - this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get()); + this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get(), m); } if (content.getCallMessage().isPresent()) { this.callMessage = new JsonCallMessage(content.getCallMessage().get()); diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java new file mode 100644 index 00000000..b20894e7 --- /dev/null +++ b/src/main/java/org/asamk/signal/json/JsonQuote.java @@ -0,0 +1,34 @@ +package org.asamk.signal.json; + +import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage; + +import java.util.ArrayList; +import java.util.List; + +public class JsonQuote { + + long id; + String author; + String text; + List attachments; + + JsonQuote(SignalServiceDataMessage.Quote quote){ + this.id = quote.getId(); + this.author = quote.getAuthor().getLegacyIdentifier(); + this.text = quote.getText(); + + if (quote.getAttachments().size() > 0) { + this.attachments = new ArrayList<>(quote.getAttachments().size()); + for (SignalServiceDataMessage.Quote.QuotedAttachment quotedAttachment : quote.getAttachments()) { + // We use this constructor to override the filename since the one in the thumbnail is lost + this.attachments.add(new JsonAttachment( + quotedAttachment.getThumbnail(), + quotedAttachment.getFileName() + )); + } + } else { + this.attachments = new ArrayList<>(); + } + } + +} diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java new file mode 100644 index 00000000..d479a57f --- /dev/null +++ b/src/main/java/org/asamk/signal/json/JsonReaction.java @@ -0,0 +1,19 @@ +package org.asamk.signal.json; + +import org.asamk.signal.manager.Manager; +import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage.Reaction; + +public class JsonReaction { + + String emoji; + String targetAuthor; + long targetSentTimestamp; + boolean isRemove; + + JsonReaction(Reaction reaction, final Manager m){ + this.emoji = reaction.getEmoji(); + this.targetAuthor = m.resolveSignalServiceAddress(reaction.getTargetAuthor()).getLegacyIdentifier(); + this.targetSentTimestamp = reaction.getTargetSentTimestamp(); + this.isRemove = reaction.isRemove(); + } +} diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java index c6571a93..47b6aea6 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java @@ -1,14 +1,15 @@ package org.asamk.signal.json; import org.asamk.Signal; +import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage; class JsonSyncDataMessage extends JsonDataMessage { String destination; - JsonSyncDataMessage(SentTranscriptMessage transcriptMessage) { - super(transcriptMessage.getMessage()); + JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, final Manager m) { + super(transcriptMessage.getMessage(), m); if (transcriptMessage.getDestination().isPresent()) { this.destination = transcriptMessage.getDestination().get().getLegacyIdentifier(); } diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java index 31c39a3f..0fa38ab0 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java @@ -1,6 +1,7 @@ package org.asamk.signal.json; import org.asamk.Signal; +import org.asamk.signal.manager.Manager; import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; import org.whispersystems.signalservice.api.push.SignalServiceAddress; @@ -21,9 +22,9 @@ class JsonSyncMessage { List readMessages; JsonSyncMessageType type; - JsonSyncMessage(SignalServiceSyncMessage syncMessage) { + JsonSyncMessage(SignalServiceSyncMessage syncMessage, final Manager m) { if (syncMessage.getSent().isPresent()) { - this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get()); + this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get(), m); } if (syncMessage.getBlockedList().isPresent()) { this.blockedNumbers = new ArrayList<>(syncMessage.getBlockedList().get().getAddresses().size());