add group info on json message

[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 1e898175ea1b4a09702c8616cd6dfd4251e2316f..f24fdbba51c2e33b3bb2f040dcccd79f889213e5 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 com.fasterxml.jackson.annotation.JsonInclude;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

-import org.asamk.Signal;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;

 
 import java.util.List;
 
 import java.util.List;

-import java.util.stream.Collectors;

 
 record JsonDataMessage(
         long timestamp,
 
 record JsonDataMessage(
         long timestamp,


@@ -16,117 +14,71 @@ record JsonDataMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean viewOnce,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReaction reaction,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonQuote quote,
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean viewOnce,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReaction reaction,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonQuote quote,

+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonPayment payment,

         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,

+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonPreview> previews,

         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonAttachment> attachments,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSharedContact> contacts,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonAttachment> attachments,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSharedContact> contacts,

-        @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryContext storyContext

 ) {
 
 ) {
 

-    static JsonDataMessage from(SignalServiceDataMessage dataMessage, Manager m) {
-        final var timestamp = dataMessage.getTimestamp();
-        final JsonGroupInfo groupInfo;
-        if (dataMessage.getGroupContext().isPresent()) {
-            final var groupContext = dataMessage.getGroupContext().get();
-            if (groupContext.getGroupV1().isPresent()) {
-                var group = groupContext.getGroupV1().get();
-                groupInfo = JsonGroupInfo.from(group);
-            } else if (groupContext.getGroupV2().isPresent()) {
-                var group = groupContext.getGroupV2().get();
-                groupInfo = JsonGroupInfo.from(group);
-            } else {
-                groupInfo = null;
-            }
-        } else {
-            groupInfo = null;
-        }
-        final var message = dataMessage.getBody().orNull();
-        final var expiresInSeconds = dataMessage.getExpiresInSeconds();
-        final var viewOnce = dataMessage.isViewOnce();
-        final var reaction = dataMessage.getReaction().isPresent() ? JsonReaction.from(dataMessage.getReaction().get(),
-                m) : null;
-        final var quote = dataMessage.getQuote().isPresent() ? JsonQuote.from(dataMessage.getQuote().get(), m) : null;
-        final List<JsonMention> mentions;
-        if (dataMessage.getMentions().isPresent()) {
-            mentions = dataMessage.getMentions()
-                    .get()
-                    .stream()
-                    .map(mention -> JsonMention.from(mention, m))
-                    .collect(Collectors.toList());
-        } else {
-            mentions = List.of();
-        }
-        final var remoteDelete = dataMessage.getRemoteDelete().isPresent()
-                ? JsonRemoteDelete.from(dataMessage.getRemoteDelete().get())
+    static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) {
+        final var timestamp = dataMessage.timestamp();
+        final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext()
+                .get(), m) : null;
+        final var storyContext = dataMessage.storyContext().isPresent()
+                ? JsonStoryContext.from(dataMessage.storyContext().get())

                 : null;
                 : null;

-        final List<JsonAttachment> attachments;
-        if (dataMessage.getAttachments().isPresent()) {
-            attachments = dataMessage.getAttachments()
-                    .get()
-                    .stream()
-                    .map(JsonAttachment::from)
-                    .collect(Collectors.toList());
-        } else {
-            attachments = List.of();
-        }
-        final var sticker = dataMessage.getSticker().isPresent()
-                ? JsonSticker.from(dataMessage.getSticker().get())
+        final var message = dataMessage.body().orElse(null);
+        final var expiresInSeconds = dataMessage.expiresInSeconds();
+        final var viewOnce = dataMessage.isViewOnce();
+        final var reaction = dataMessage.reaction().map(JsonReaction::from).orElse(null);
+        final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null;
+        final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null;
+        final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions()
+                .stream()
+                .map(JsonMention::from)
+                .toList() : null;
+        final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews()
+                .stream()
+                .map(JsonPreview::from)
+                .toList() : null;
+        final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
+                ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())

                 : null;
                 : null;

+        final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments()
+                .stream()
+                .map(JsonAttachment::from)
+                .toList() : null;
+        final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
+        final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts()
+                .stream()
+                .map(JsonSharedContact::from)
+                .toList() : null;
+        final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;

 
 

-        final List<JsonSharedContact> contacts;
-        if (dataMessage.getSharedContacts().isPresent()) {
-            contacts = dataMessage.getSharedContacts()
-                    .get()
-                    .stream()
-                    .map(JsonSharedContact::from)
-                    .collect(Collectors.toList());
-        } else {
-            contacts = List.of();
-        }

         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
                 viewOnce,
                 reaction,
                 quote,
         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
                 viewOnce,
                 reaction,
                 quote,

+                payment,

                 mentions,
                 mentions,

+                previews,

                 attachments,
                 sticker,
                 remoteDelete,
                 contacts,
                 attachments,
                 sticker,
                 remoteDelete,
                 contacts,

-                groupInfo);
-    }
-
-    static JsonDataMessage from(Signal.MessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
-    }
-
-    static JsonDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonDataMessage(messageReceived.getTimestamp(),
-                messageReceived.getMessage(),
-                // TODO Replace these with the proper commands
-                null,
-                null,
-                null,
-                null,
-                null,
-                messageReceived.getAttachments().stream().map(JsonAttachment::from).collect(Collectors.toList()),
-                null,
-                null,
-                null,
-                messageReceived.getGroupId().length > 0 ? JsonGroupInfo.from(messageReceived.getGroupId()) : null);
+                textStyles,
+                groupInfo,
+                storyContext);

     }
 }
     }
 }