Use improved shutdown for jsonRpc command

[signal-cli] / src / main / java / org / asamk / signal / util / CommandUtil.java

diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index 3fa9aecd33abe1c2a006c9956c6fdf453ba0a752..48decc7a0c68323b83be4fbb2e8f67ac6997df81 100644 (file)
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.util;
 
+import net.sourceforge.argparse4j.inf.Namespace;
+
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
@@ -7,6 +9,7 @@ import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupIdFormatException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 
 import java.util.Collection;
@@ -105,8 +108,7 @@ public class CommandUtil {
             message = """
                       Captcha required for verification, use --captcha CAPTCHA
                       To get the token, go to https://signalcaptchas.org/registration/generate.html
-                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                      Everything after signalcaptcha:// is the captcha token.""";
+                      After solving the captcha, right-click on the "Open Signal" link and copy the link.""";
         } else {
             message = "Invalid captcha given.";
         }
@@ -123,4 +125,12 @@ public class CommandUtil {
         }
         return message;
     }
+
+    public 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);
+    }
 }