Add null check and change some formatting

[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 fc8538aaa2dc4fca754118ba906a4150cb7a0150..57201eda7c68f1553ec7c6783b3c04044c4c9ec8 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
 import org.asamk.Signal;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
+import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
+import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -14,26 +14,51 @@ class JsonDataMessage {
     long timestamp;
     String message;
     int expiresInSeconds;
+
+    JsonReaction reaction;
+    JsonQuote quote;
+    List<JsonMention> mentions;
     List<JsonAttachment> attachments;
     JsonGroupInfo groupInfo;
 
-    JsonDataMessage(SignalServiceDataMessage dataMessage) {
+    JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
         this.timestamp = dataMessage.getTimestamp();
-        if (dataMessage.getGroupContext().isPresent() && dataMessage.getGroupContext().get().getGroupV1().isPresent()) {
-            SignalServiceGroup groupInfo = dataMessage.getGroupContext().get().getGroupV1().get();
-            this.groupInfo = new JsonGroupInfo(groupInfo);
+        if (dataMessage.getGroupContext().isPresent()) {
+            if (dataMessage.getGroupContext().get().getGroupV1().isPresent()) {
+                SignalServiceGroup groupInfo = dataMessage.getGroupContext().get().getGroupV1().get();
+                this.groupInfo = new JsonGroupInfo(groupInfo);
+            } else if (dataMessage.getGroupContext().get().getGroupV2().isPresent()) {
+                SignalServiceGroupV2 groupInfo = dataMessage.getGroupContext().get().getGroupV2().get();
+                this.groupInfo = new JsonGroupInfo(groupInfo);
+            }
         }
         if (dataMessage.getBody().isPresent()) {
             this.message = dataMessage.getBody().get();
         }
         this.expiresInSeconds = dataMessage.getExpiresInSeconds();
+        if (dataMessage.getReaction().isPresent()) {
+            this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
+        }
+        if (dataMessage.getQuote().isPresent()) {
+            this.quote = new JsonQuote(dataMessage.getQuote().get(), m);
+        }
+        if (dataMessage.getMentions().isPresent()) {
+            this.mentions = dataMessage.getMentions()
+                    .get()
+                    .stream()
+                    .map(mention -> new JsonMention(mention, m))
+                    .collect(Collectors.toList());
+        } else {
+            this.mentions = List.of();
+        }
         if (dataMessage.getAttachments().isPresent()) {
-            this.attachments = new ArrayList<>(dataMessage.getAttachments().get().size());
-            for (SignalServiceAttachment attachment : dataMessage.getAttachments().get()) {
-                this.attachments.add(new JsonAttachment(attachment));
-            }
+            this.attachments = dataMessage.getAttachments()
+                    .get()
+                    .stream()
+                    .map(JsonAttachment::new)
+                    .collect(Collectors.toList());
         } else {
-            this.attachments = new ArrayList<>();
+            this.attachments = List.of();
         }
     }
 
@@ -41,19 +66,19 @@ class JsonDataMessage {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
-        attachments = messageReceived.getAttachments()
-                .stream()
-                .map(JsonAttachment::new)
-                .collect(Collectors.toList());
+        reaction = null;    // TODO Replace these 3 with the proper commands
+        quote = null;
+        mentions = null;
+        attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 
     public JsonDataMessage(Signal.SyncMessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         groupInfo = new JsonGroupInfo(messageReceived.getGroupId());
-        attachments = messageReceived.getAttachments()
-                .stream()
-                .map(JsonAttachment::new)
-                .collect(Collectors.toList());
+        reaction = null;    // TODO Replace these 3 with the proper commands
+        quote = null;
+        mentions = null;
+        attachments = messageReceived.getAttachments().stream().map(JsonAttachment::new).collect(Collectors.toList());
     }
 }