From 6c32aff81223e3cebc800ccc089e7feacbf68b8a Mon Sep 17 00:00:00 2001 From: signals-from-outer-space Date: Sun, 2 Apr 2023 08:34:43 +0200 Subject: [PATCH] Added missing file attachment attributes in JsonAttachment output --- .../org/asamk/signal/json/JsonAttachment.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java index 1f6e6510..87b5ed4e 100644 --- a/src/main/java/org/asamk/signal/json/JsonAttachment.java +++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java @@ -1,13 +1,23 @@ package org.asamk.signal.json; +import java.io.File; + import org.asamk.signal.manager.api.MessageEnvelope; -record JsonAttachment(String contentType, String filename, String id, Long size) { +record JsonAttachment(String contentType, String filename, String id, Long size, Integer width, Integer height, + String caption, Long uploadTimestamp, File file) { - 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); - return new JsonAttachment(attachment.contentType(), filename, id, 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); + final var file = attachment.file().orElse(null); + + return new JsonAttachment(attachment.contentType(), filename, id, size, width, height, caption, uploadTimestamp, + file); + } }