X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/30690785fd51f9ba841f6f57d5f403bd970f26e3..19b15e68e4ec652e23f9625662b7c0f96b963029:/src/main/java/org/asamk/signal/json/JsonQuote.java

diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index f90b492d..514f3db9 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -1,56 +1,45 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.asamk.signal.util.Util.getLegacyIdentifier;
-
-public class JsonQuote {
-
-    @JsonProperty
-    final long id;
-
-    @JsonProperty
-    final String author;
-
-    @JsonProperty
-    final String text;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final List<JsonMention> mentions;
-
-    @JsonProperty
-    final List<JsonQuotedAttachment> attachments;
-
-    JsonQuote(SignalServiceDataMessage.Quote quote, Manager m) {
-        this.id = quote.getId();
-        this.author = getLegacyIdentifier(m.resolveSignalServiceAddress(quote.getAuthor()));
-        this.text = quote.getText();
-
-        if (quote.getMentions() != null && quote.getMentions().size() > 0) {
-            this.mentions = quote.getMentions()
-                    .stream()
-                    .map(quotedMention -> new JsonMention(quotedMention, m))
-                    .collect(Collectors.toList());
-        } else {
-            this.mentions = null;
-        }
-
-        if (quote.getAttachments().size() > 0) {
-            this.attachments = quote.getAttachments()
-                    .stream()
-                    .map(JsonQuotedAttachment::new)
-                    .collect(Collectors.toList());
-        } else {
-            this.attachments = new ArrayList<>();
-        }
+import java.util.UUID;
+
+public record JsonQuote(
+        long id,
+        @Deprecated String author,
+        String authorNumber,
+        String authorUuid,
+        String text,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
+        List<JsonQuotedAttachment> attachments,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles
+) {
+
+    static JsonQuote from(MessageEnvelope.Data.Quote quote) {
+        final var id = quote.id();
+        final var address = quote.author();
+        final var author = address.getLegacyIdentifier();
+        final var authorNumber = address.number().orElse(null);
+        final var authorUuid = address.uuid().map(UUID::toString).orElse(null);
+        final var text = quote.text().orElse(null);
+
+        final var mentions = !quote.mentions().isEmpty()
+                ? quote.mentions().stream().map(JsonMention::from).toList()
+                : null;
+
+        final var attachments = !quote.attachments().isEmpty() ? quote.attachments()
+                .stream()
+                .map(JsonQuotedAttachment::from)
+                .toList() : List.<JsonQuotedAttachment>of();
+
+        final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;
+
+        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles);
     }
 }