Improve error message if captcha is rejected by server

[signal-cli] / src / main / java / org / asamk / signal / commands / SubmitRateLimitChallengeCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
index 46f69896d825172683a5eb05095a66dc76762b7a..91c6fc676501a577014634512e6e5c21216ae094 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
@@ -3,10 +3,12 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
 
@@ -32,13 +34,15 @@ public class SubmitRateLimitChallengeCommand implements JsonRpcLocalCommand {
     @Override
     public void handleCommand(final Namespace ns, final Manager m, OutputWriter outputWriter) throws CommandException {
         final var challenge = ns.getString("challenge");
-        final var captchaString = ns.getString("captcha");
-        final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");
+        final var captcha = ns.getString("captcha");
 
         try {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new IOErrorException("Submit challenge error: " + e.getMessage(), e);
+        } catch (CaptchaRejectedException e) {
+            throw new UserErrorException(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
         }
     }
 }