X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/60d530eae4708dc2de69e07c71ba636a0b56ab45..063fb95dca87b6b57996c7379b958ae05e2e5ad9:/src/main/java/org/asamk/signal/ReceiveMessageHandler.java

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 4cb09440..34d941ed 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -76,7 +76,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             if (content == null) {
                 System.out.println("Failed to decrypt message.");
             } else {
-                System.out.println(String.format("Sender: %s (device: %d)", content.getSender().getNumber().get(), content.getSenderDevice()));
+                ContactInfo sourceContact = m.getContact(content.getSender().getNumber().get());
+                System.out.println(String.format("Sender: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender().getNumber().get(), content.getSenderDevice()));
                 if (content.getDataMessage().isPresent()) {
                     SignalServiceDataMessage message = content.getDataMessage().get();
                     handleSignalServiceDataMessage(message);
@@ -311,6 +312,15 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
         }
 
+        if (message.getReaction().isPresent()) {
+            final SignalServiceDataMessage.Reaction reaction = message.getReaction().get();
+            System.out.println("Reaction:");
+            System.out.println(" - Emoji: " + reaction.getEmoji());
+            System.out.println(" - Target author: " + reaction.getTargetAuthor().getNumber());
+            System.out.println(" - Target timestamp: " + reaction.getTargetSentTimestamp());
+            System.out.println(" - Is remove: " + reaction.isRemove());
+        }
+
         if (message.getQuote().isPresent()) {
             SignalServiceDataMessage.Quote quote = message.getQuote().get();
             System.out.println("Quote: (" + quote.getId() + ")");