Log signal-cli version on startup

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

diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index afb4ee11254214e1a0ea39b1bf3013603945fcb7..3ff6dc094fade5b1f3d623ab739c311c526b3dc3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -6,13 +6,16 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.JsonWriter;

 import org.asamk.signal.OutputType;
 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.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.OutputType;
 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.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;

+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.util.DateUtils;

 
 import java.io.IOException;
 import java.util.List;
 
 import java.io.IOException;
 import java.util.List;


@@ -64,20 +67,33 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
     ) throws UserErrorException, IOErrorException {
         try {
             m.register(voiceVerification, captcha);
     ) throws UserErrorException, IOErrorException {
         try {
             m.register(voiceVerification, captcha);

+        } catch (RateLimitException e) {
+            String message = "Rate limit reached";
+            if (e.getNextAttemptTimestamp() > 0) {
+                message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+            }
+            throw new UserErrorException(message);

         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {
                 message = """
         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {
                 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.""";
+                          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.""";

             } else {
                 message = "Invalid captcha given.";
             }
             } else {
                 message = "Invalid captcha given.";
             }

+            if (e.getNextAttemptTimestamp() > 0) {
+                message += "\nNext Captcha may be provided at "
+                        + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+            }

             throw new UserErrorException(message);
             throw new UserErrorException(message);

+        } catch (NonNormalizedPhoneNumberException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage(), e);

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new IOErrorException("Request verify error: " + e.getMessage(), e);
+            throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);

         }
     }
 
         }
     }