X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce70a623c21a267679d59838d041f9bc1d486cd9..fea19c9e20ed07228420dae93399911a659e51b1:/src/main/java/org/asamk/signal/commands/ReceiveCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index e1a9a2f3..4d5bdff0 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -4,31 +4,24 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.Signal;
-import org.asamk.signal.JsonReceiveMessageHandler;
-import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
-import org.asamk.signal.json.JsonMessageEnvelope;
+import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.util.DateUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.Base64;
+import java.time.Duration;
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
-public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
+public class ReceiveCommand implements LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
@@ -47,6 +40,12 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--ignore-stories")
+                .help("Don’t receive story messages from the server.")
+                .action(Arguments.storeTrue());
+        subparser.addArgument("--send-read-receipts")
+                .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
+                .action(Arguments.storeTrue());
     }
 
     @Override
@@ -54,109 +53,22 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 
-    public void handleCommand(
-            final Namespace ns, final Signal signal, DBusConnection dbusconnection, final OutputWriter outputWriter
-    ) throws CommandException {
-        try {
-            if (outputWriter instanceof JsonWriter jsonWriter) {
-
-                dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> {
-                    var envelope = new JsonMessageEnvelope(messageReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-
-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {
-                    var envelope = new JsonMessageEnvelope(receiptReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-
-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {
-                    var envelope = new JsonMessageEnvelope(syncReceived);
-                    final var object = Map.of("envelope", envelope);
-                    jsonWriter.write(object);
-                });
-            } else {
-                final var writer = (PlainTextWriter) outputWriter;
-
-                dbusconnection.addSigHandler(Signal.MessageReceived.class, signal, messageReceived -> {
-                    writer.println("Envelope from: {}", messageReceived.getSender());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
-                    writer.println("Body: {}", messageReceived.getMessage());
-                    if (messageReceived.getGroupId().length > 0) {
-                        writer.println("Group info:");
-                        writer.indentedWriter()
-                                .println("Id: {}", Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
-                    }
-                    if (messageReceived.getAttachments().size() > 0) {
-                        writer.println("Attachments:");
-                        for (var attachment : messageReceived.getAttachments()) {
-                            writer.println("- Stored plaintext in: {}", attachment);
-                        }
-                    }
-                    writer.println();
-                });
-
-                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, signal, receiptReceived -> {
-                    writer.println("Receipt from: {}", receiptReceived.getSender());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
-                });
-
-                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, signal, syncReceived -> {
-                    writer.println("Sync Envelope from: {} to: {}",
-                            syncReceived.getSource(),
-                            syncReceived.getDestination());
-                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(syncReceived.getTimestamp()));
-                    writer.println("Body: {}", syncReceived.getMessage());
-                    if (syncReceived.getGroupId().length > 0) {
-                        writer.println("Group info:");
-                        writer.indentedWriter()
-                                .println("Id: {}", Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
-                    }
-                    if (syncReceived.getAttachments().size() > 0) {
-                        writer.println("Attachments:");
-                        for (var attachment : syncReceived.getAttachments()) {
-                            writer.println("- Stored plaintext in: {}", attachment);
-                        }
-                    }
-                    writer.println();
-                });
-            }
-        } catch (DBusException e) {
-            logger.error("Dbus client failed", e);
-            throw new UnexpectedErrorException("Dbus client failed", e);
-        }
-
-        double timeout = ns.getDouble("timeout");
-        long timeoutMilliseconds = timeout < 0 ? 10000 : (long) (timeout * 1000);
-
-        while (true) {
-            try {
-                Thread.sleep(timeoutMilliseconds);
-            } catch (InterruptedException ignored) {
-                break;
-            }
-            if (timeout >= 0) {
-                break;
-            }
-        }
-    }
-
     @Override
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        double timeout = ns.getDouble("timeout");
-        boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        m.setIgnoreAttachments(ignoreAttachments);
+        final var timeout = ns.getDouble("timeout");
+        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
             if (timeout < 0) {
                 m.receiveMessages(handler);
             } else {
-                m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, handler);
+                m.receiveMessages(Duration.ofMillis((long) (timeout * 1000)), handler);
             }
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);