webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-30 02:50:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve handling of CDSI resource exhaustion

Browse source
This commit is contained in:
AsamK 2023-10-15 19:02:59 +02:00
parent a675631965
commit 7cd24a74af
4 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
View file

@ -5,11 +5,14 @@ import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.IOErrorException;
import org.asamk.signal.commands.exceptions.RateLimitErrorException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.api.RateLimitException;
import org.asamk.signal.manager.api.UserStatus;
import org.asamk.signal.output.JsonWriter;
import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.output.PlainTextWriter;
import org.asamk.signal.util.CommandUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -40,6 +43,9 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
Map<String, UserStatus> registered;
try {
registered = m.getUserStatus(new HashSet<>(ns.getList("recipient")));
} catch (RateLimitException e) {
final var message = CommandUtil.getRateLimitMessage(e);
throw new RateLimitErrorException(message, e);
} catch (IOException e) {
throw new IOErrorException("Unable to check if users are registered: "
+ e.getMessage()