X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2..33c4e17c0d295d437438f6e1d8fbfd1ae6640f3c:/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 311b78af..3fa9aecd 100644 --- a/src/main/java/org/asamk/signal/util/CommandUtil.java +++ b/src/main/java/org/asamk/signal/util/CommandUtil.java @@ -2,9 +2,11 @@ package org.asamk.signal.util; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.manager.api.CaptchaRequiredException; 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.RecipientIdentifier; import java.util.Collection; @@ -96,4 +98,29 @@ public class CommandUtil { throw new UserErrorException("Invalid phone number '" + recipientString + "': " + e.getMessage(), e); } } + + public static String getCaptchaRequiredMessage(final CaptchaRequiredException e, final boolean captchaProvided) { + String message; + if (!captchaProvided) { + 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."""; + } else { + message = "Invalid captcha given."; + } + if (e.getNextAttemptTimestamp() > 0) { + message += "\nNext Captcha may be provided at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()); + } + return message; + } + + public static String getRateLimitMessage(final RateLimitException e) { + String message = "Rate limit reached"; + if (e.getNextAttemptTimestamp() > 0) { + message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()); + } + return message; + } }