X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/27dbc671e09c3efbaaf4d0f16d3ccdfb640ae603..8d55dfb66bc0dfbd2b601a27075f2876cde918e3:/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index ef33a6e8..166dfcef 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -8,6 +8,7 @@ import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
@@ -19,7 +20,7 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class JsonRpcDispatcherCommand implements LocalCommand {
+public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
 
@@ -34,9 +35,16 @@ public class JsonRpcDispatcherCommand implements 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());
+        subparser.addArgument("--receive-mode")
+                .help("Specify when to start receiving messages.")
+                .type(Arguments.enumStringType(ReceiveMode.class))
+                .setDefault(ReceiveMode.ON_START);
     }
 
     @Override
@@ -48,15 +56,45 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        final boolean ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final boolean sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, sendReadReceipts));
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        m.setReceiveConfig(receiveConfig);
 
         final var jsonOutputWriter = (JsonWriter) outputWriter;
-        final Supplier<String> lineSupplier = IOUtils.getLineSupplier(new InputStreamReader(System.in,
-                IOUtils.getConsoleCharset()));
+        final var lineSupplier = getLineSupplier();
 
-        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, false);
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
         handler.handleConnection(m);
     }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));
+        c.addOnManagerAddedHandler(m -> m.setReceiveConfig(receiveConfig));
+
+        final var jsonOutputWriter = (JsonWriter) outputWriter;
+        final var lineSupplier = getLineSupplier();
+
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
+        handler.handleConnection(c);
+    }
+
+    private static ReceiveConfig getReceiveConfig(final Namespace ns) {
+        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"));
+        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
+    }
+
+    private static Supplier<String> getLineSupplier() {
+        return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
+    }
 }