Refactor manager lib package structure

[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 6f512016ee0b0126446c679abc2edb6bad4a5cb8..98c3571e4f1935035bb7b583ddeccafbd61fd29f 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -2,9 +2,9 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

+import org.asamk.signal.manager.api.GroupId;

 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.MessageEnvelope;

-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientAddress;

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


@@ -16,30 +16,20 @@ enum JsonSyncMessageType {
 
 record JsonSyncMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
 
 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
 ) {
 
         @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
 ) {
 

-    JsonSyncMessage(
-            final JsonSyncDataMessage sentMessage,
-            final List<String> blockedNumbers,
-            final List<String> blockedGroupIds,
-            final List<JsonSyncReadMessage> readMessages,
-            final JsonSyncMessageType type
-    ) {
-        this.sentMessage = sentMessage;
-        this.blockedNumbers = blockedNumbers;
-        this.blockedGroupIds = blockedGroupIds;
-        this.readMessages = readMessages;
-        this.type = type;
-    }
-

     static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {
     static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {

-        final var sentMessage = syncMessage.sent().isPresent()
+        final var sentMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isEmpty()

                 ? JsonSyncDataMessage.from(syncMessage.sent().get())
                 : null;
                 ? JsonSyncDataMessage.from(syncMessage.sent().get())
                 : null;

+        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()) {
         final List<String> blockedNumbers;
         final List<String> blockedGroupIds;
         if (syncMessage.blocked().isPresent()) {


@@ -68,6 +58,6 @@ record JsonSyncMessage(
         } else {
             type = null;
         }
         } else {
             type = null;
         }

-        return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type);
+        return new JsonSyncMessage(sentMessage, sentStoryMessage, blockedNumbers, blockedGroupIds, readMessages, type);

     }
 }
     }
 }