add group info on json message

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

diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index 1b2a7bc7fde92950c92c970e9052f03d2a5179f4..c75b3987700c18cbff3e72fe8573656b1ce16bb9 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -1,45 +1,34 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
-
-class JsonAttachment {
-
-    @JsonProperty
-    final String contentType;
-
-    @JsonProperty
-    final String filename;
-
-    @JsonProperty
-    final String id;
-
-    @JsonProperty
-    final Long size;
-
-    JsonAttachment(SignalServiceAttachment attachment) {
-        this.contentType = attachment.getContentType();
-
-        if (attachment.isPointer()) {
-            final SignalServiceAttachmentPointer pointer = attachment.asPointer();
-            this.id = pointer.getRemoteId().toString();
-            this.filename = pointer.getFileName().orNull();
-            this.size = pointer.getSize().transform(Integer::longValue).orNull();
-        } else {
-            final SignalServiceAttachmentStream stream = attachment.asStream();
-            this.id = null;
-            this.filename = stream.getFileName().orNull();
-            this.size = stream.getLength();
-        }
-    }
-
-    JsonAttachment(String filename) {
-        this.filename = filename;
-        this.contentType = null;
-        this.id = null;
-        this.size = null;
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+record JsonAttachment(
+        String contentType,
+        String filename,
+        String id,
+        Long size,
+        Integer width,
+        Integer height,
+        String caption,
+        Long uploadTimestamp
+) {
+
+    static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
+        final var id = attachment.id().orElse(null);
+        final var filename = attachment.fileName().orElse(null);
+        final var size = attachment.size().orElse(null);
+        final var width = attachment.width().orElse(null);
+        final var height = attachment.height().orElse(null);
+        final var caption = attachment.caption().orElse(null);
+        final var uploadTimestamp = attachment.uploadTimestamp().orElse(null);
+
+        return new JsonAttachment(attachment.contentType(),
+                filename,
+                id,
+                size,
+                width,
+                height,
+                caption,
+                uploadTimestamp);
     }
 }