Rename Cli class to App

[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 957e3a792d77dc2e5cad3c87fb02166465936400..fd3f1efc1939400a94d42075e76dc18dc212d247 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -2,12 +2,10 @@ package org.asamk.signal.json;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 
 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;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 
 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;
 
 import java.util.List;
 import java.util.stream.Collectors;
 


@@ -21,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) {


@@ -45,40 +44,47 @@ class JsonDataMessage {
             this.quote = new JsonQuote(dataMessage.getQuote().get(), m);
         }
         if (dataMessage.getMentions().isPresent()) {
             this.quote = new JsonQuote(dataMessage.getQuote().get(), m);
         }
         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, m));
-            }
+            this.mentions = dataMessage.getMentions()
+                    .get()
+                    .stream()
+                    .map(mention -> new JsonMention(mention, m))
+                    .collect(Collectors.toList());

         } else {
         } else {

-            this.mentions = new ArrayList<>();
+            this.mentions = List.of();

         }
         if (dataMessage.getAttachments().isPresent()) {
         }
         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 {
         } else {

-            this.attachments = new ArrayList<>();
+            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();
         }
     }
 
     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
+        groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null;
+        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());
     }
 
     public JsonDataMessage(Signal.SyncMessageReceived messageReceived) {
         timestamp = messageReceived.getTimestamp();
         message = messageReceived.getMessage();
         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());
-        reaction = null;    // TODO Replace these 3 with the proper commands
+        groupInfo = messageReceived.getGroupId().length > 0 ? new JsonGroupInfo(messageReceived.getGroupId()) : null;
+        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());
     }
 }