Refactor receive api

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

diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
index ccd5960b3e3a53f69667e5a5af428c239038d821..5616fdb4c4ab6c19bf105f5c040b52c4400d8100 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -1,38 +1,21 @@
 package org.asamk.signal.json;
 
-import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
-class JsonReceiptMessage {
+record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List<Long> timestamps) {
 
-    long when;
-    boolean isDelivery;
-    boolean isRead;
-    List<Long> timestamps;
-
-    JsonReceiptMessage(SignalServiceReceiptMessage receiptMessage) {
-
-        this.when = receiptMessage.getWhen();
-        if (receiptMessage.isDeliveryReceipt()) {
-            this.isDelivery = true;
-        }
-        if (receiptMessage.isReadReceipt()) {
-            this.isRead = true;
-        }
-        this.timestamps = receiptMessage.getTimestamps();
-    }
-
-    private JsonReceiptMessage(
-            final long when, final boolean isDelivery, final boolean isRead, final List<Long> timestamps
-    ) {
-        this.when = when;
-        this.isDelivery = isDelivery;
-        this.isRead = isRead;
-        this.timestamps = timestamps;
+    static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) {
+        final var when = receiptMessage.when();
+        final var isDelivery = receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY;
+        final var isRead = receiptMessage.type() == MessageEnvelope.Receipt.Type.READ;
+        final var isViewed = receiptMessage.type() == MessageEnvelope.Receipt.Type.VIEWED;
+        final var timestamps = receiptMessage.timestamps();
+        return new JsonReceiptMessage(when, isDelivery, isRead, isViewed, timestamps);
     }
 
     static JsonReceiptMessage deliveryReceipt(final long when, final List<Long> timestamps) {
-        return new JsonReceiptMessage(when, true, false, timestamps);
+        return new JsonReceiptMessage(when, true, false, false, timestamps);
     }
 }