add group info on json message

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 6e992bcb0be0232c4fc0978e90bb7fadd10c6a17..072b2e3b7f3096eb3893fa107e1290a627eacc76 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -1,18 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

 
 

-import org.asamk.Signal;

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

-import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;

 
 

-import java.util.Base64;

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

-import java.util.stream.Collectors;
-
-import static org.asamk.signal.util.Util.getLegacyIdentifier;

 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
 
 enum JsonSyncMessageType {
     CONTACTS_SYNC,


@@ -20,77 +15,50 @@ enum JsonSyncMessageType {
     REQUEST_SYNC
 }
 
     REQUEST_SYNC
 }
 

-class JsonSyncMessage {
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncDataMessage sentMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedNumbers;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<String> blockedGroupIds;
+record JsonSyncMessage(
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncStoryMessage sentStoryMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedNumbers,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<String> blockedGroupIds,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSyncReadMessage> readMessages,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type
+) {

 
 

-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonSyncReadMessage> readMessages;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncMessageType type;
-
-    JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {
-        this.sentMessage = syncMessage.getSent().isPresent()
-                ? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
+    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage, Manager m) {
+        final var sentMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isEmpty()
+                ? JsonSyncDataMessage.from(syncMessage.sent().get(), m)

                 : null;
                 : null;

-        if (syncMessage.getBlockedList().isPresent()) {
-            final var base64 = Base64.getEncoder();
-            this.blockedNumbers = syncMessage.getBlockedList()
-                    .get()
-                    .getAddresses()
-                    .stream()
-                    .map(Util::getLegacyIdentifier)
-                    .collect(Collectors.toList());
-            this.blockedGroupIds = syncMessage.getBlockedList()
-                    .get()
-                    .getGroupIds()
-                    .stream()
-                    .map(base64::encodeToString)
-                    .collect(Collectors.toList());
-        } else {
-            this.blockedNumbers = null;
-            this.blockedGroupIds = null;
-        }
-        if (syncMessage.getRead().isPresent()) {
-            this.readMessages = syncMessage.getRead()
+        final var sentStoryMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isPresent()
+                ? JsonSyncStoryMessage.from(syncMessage.sent().get())
+                : null;
+        final List<String> blockedNumbers;
+        final List<String> blockedGroupIds;
+        if (syncMessage.blocked().isPresent()) {
+            blockedNumbers = syncMessage.blocked()

                     .get()
                     .get()

+                    .recipients()

                     .stream()
                     .stream()

-                    .map(message -> new JsonSyncReadMessage(getLegacyIdentifier(message.getSender()),
-                            message.getTimestamp()))
-                    .collect(Collectors.toList());
+                    .map(RecipientAddress::getLegacyIdentifier)
+                    .toList();
+            blockedGroupIds = syncMessage.blocked().get().groupIds().stream().map(GroupId::toBase64).toList();

         } else {
         } else {

-            this.readMessages = null;
+            blockedNumbers = null;
+            blockedGroupIds = null;

         }
 
         }
 

-        if (syncMessage.getContacts().isPresent()) {
-            this.type = JsonSyncMessageType.CONTACTS_SYNC;
-        } else if (syncMessage.getGroups().isPresent()) {
-            this.type = JsonSyncMessageType.GROUPS_SYNC;
-        } else if (syncMessage.getRequest().isPresent()) {
-            this.type = JsonSyncMessageType.REQUEST_SYNC;
+        final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read()
+                .stream()
+                .map(JsonSyncReadMessage::from)
+                .toList() : null;
+
+        final JsonSyncMessageType type;
+        if (syncMessage.contacts().isPresent()) {
+            type = JsonSyncMessageType.CONTACTS_SYNC;
+        } else if (syncMessage.groups().isPresent()) {
+            type = JsonSyncMessageType.GROUPS_SYNC;

         } else {
         } else {

-            this.type = null;
+            type = null;

         }
         }

-    }
-
-    JsonSyncMessage(Signal.SyncMessageReceived messageReceived) {
-        this.sentMessage = new JsonSyncDataMessage(messageReceived);
-        this.blockedNumbers = null;
-        this.blockedGroupIds = null;
-        this.readMessages = null;
-        this.type = null;
+        return new JsonSyncMessage(sentMessage, sentStoryMessage, blockedNumbers, blockedGroupIds, readMessages, type);

     }
 }
     }
 }