Recreate recipient database with aci column

[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 1949171ae87da900163aea08b886f4a9be579908..c75b3987700c18cbff3e72fe8573656b1ce16bb9 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -1,31 +1,34 @@
 package org.asamk.signal.json;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
-class JsonAttachment {
+record JsonAttachment(
+        String contentType,
+        String filename,
+        String id,
+        Long size,
+        Integer width,
+        Integer height,
+        String caption,
+        Long uploadTimestamp
+) {
 
-    String contentType;
-    String filename;
-    String id;
-    int size;
+    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);
 
-    JsonAttachment(SignalServiceAttachment attachment) {
-        this.contentType = attachment.getContentType();
-
-        final SignalServiceAttachmentPointer pointer = attachment.asPointer();
-        if (attachment.isPointer()) {
-            this.id = String.valueOf(pointer.getRemoteId());
-            if (pointer.getFileName().isPresent()) {
-                this.filename = pointer.getFileName().get();
-            }
-            if (pointer.getSize().isPresent()) {
-                this.size = pointer.getSize().get();
-            }
-        }
-    }
-
-    JsonAttachment(String filename) {
-        this.filename = filename;
+        return new JsonAttachment(attachment.contentType(),
+                filename,
+                id,
+                size,
+                width,
+                height,
+                caption,
+                uploadTimestamp);
     }
 }