webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-02 12:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added missing file attachment attributes in JsonAttachment output

Browse source
This commit is contained in:
signals-from-outer-space 2023-04-02 08:34:43 +02:00
parent 21aa2b2a7f
commit 6c32aff812
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/asamk/signal/json/JsonAttachment.java
View file

@ -1,13 +1,23 @@
package org.asamk.signal.json; package org.asamk.signal.json;
import java.io.File;
import org.asamk.signal.manager.api.MessageEnvelope; 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) { static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
final var id = attachment.id().orElse(null); final var id = attachment.id().orElse(null);
final var filename = attachment.fileName().orElse(null); final var filename = attachment.fileName().orElse(null);
final var size = attachment.size().orElse(null); final var size = attachment.size().orElse(null);
return new JsonAttachment(attachment.contentType(), filename, id, size); 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);
} }
} }