Added sticker field to json output. Also added hidden mac file to .gitignore (#418)

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

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 57201eda7c68f1553ec7c6783b3c04044c4c9ec8..787f47abb79a4434327ef01b858ee68b9f6529b6 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -19,6 +19,7 @@ class JsonDataMessage {
     JsonQuote quote;
     List<JsonMention> mentions;
     List<JsonAttachment> attachments;
     JsonQuote quote;
     List<JsonMention> mentions;
     List<JsonAttachment> attachments;

+    JsonSticker sticker;

     JsonGroupInfo groupInfo;
 
     JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
     JsonGroupInfo groupInfo;
 
     JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {


@@ -60,15 +61,19 @@ class JsonDataMessage {
         } else {
             this.attachments = List.of();
         }
         } else {
             this.attachments = List.of();
         }

+        if (dataMessage.getSticker().isPresent()) {
+            this.sticker = new JsonSticker(dataMessage.getSticker().get());
+        }

     }
 
     public JsonDataMessage(Signal.MessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
     }
 
     public JsonDataMessage(Signal.MessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());

-        reaction = null;    // TODO Replace these 3 with the proper commands
+        reaction = null;    // TODO Replace these 4 with the proper commands

         quote = null;
         mentions = null;
         quote = null;
         mentions = null;

+        sticker = null;

         attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 
         attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 


@@ -76,9 +81,10 @@ class JsonDataMessage {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());

-        reaction = null;    // TODO Replace these 3 with the proper commands
+        reaction = null;    // TODO Replace these 4 with the proper commands

         quote = null;
         mentions = null;
         quote = null;
         mentions = null;

+        sticker = null;

         attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 }
         attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 }