Improve error handling of getUserStatus command for invalid phonen numbers

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

diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 98fce6676d018e504928ce817e572a390d6f98d5..cf2b19814a8f3aba9103ec133e505f754bc838bf 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,42 +3,64 @@ package org.asamk.signal.commands;
 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.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.NotMasterDeviceException;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;

 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;

-import org.asamk.signal.util.Util;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 

-public class BlockCommand implements LocalCommand {
+import java.io.IOException;
+
+public class BlockCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 

+    @Override
+    public String getName() {
+        return "block";
+    }
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("contact").help("Contact number").nargs("*");
-        subparser.addArgument("-g", "--group").help("Group ID").nargs("*");

         subparser.help("Block the given contacts or groups (no messages will be received)");
         subparser.help("Block the given contacts or groups (no messages will be received)");

+        subparser.addArgument("recipient").help("Contact number").nargs("*");
+        subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*");

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) {
-        for (var contact_number : ns.<String>getList("contact")) {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var contacts = ns.<String>getList("recipient");
+        for (var contact : CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber())) {

             try {
             try {

-                m.setContactBlocked(contact_number, true);
-            } catch (InvalidNumberException e) {
-                logger.warn("Invalid number {}: {}", contact_number, e.getMessage());
+                m.setContactBlocked(contact, true);
+            } catch (NotMasterDeviceException e) {
+                throw new UserErrorException("This command doesn't work on linked devices.");
+            } catch (IOException e) {
+                throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

             }
         }
 
             }
         }
 

-        if (ns.<String>getList("group") != null) {
-            for (var groupIdString : ns.<String>getList("group")) {
+        final var groupIdStrings = ns.<String>getList("group-id");
+        if (groupIdStrings != null) {
+            for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {

                 try {
                 try {

-                    var groupId = Util.decodeGroupId(groupIdString);

                     m.setGroupBlocked(groupId, true);
                     m.setGroupBlocked(groupId, true);

-                } catch (GroupIdFormatException | GroupNotFoundException e) {
-                    logger.warn("Invalid group id {}: {}", groupIdString, e.getMessage());
+                } catch (NotMasterDeviceException e) {
+                    throw new UserErrorException("This command doesn't work on linked devices.");
+                } catch (GroupNotFoundException e) {
+                    logger.warn("Group not found {}: {}", groupId.toBase64(), e.getMessage());
+                } catch (IOException e) {
+                    throw new UnexpectedErrorException("Failed to sync block to linked devices: " + e.getMessage(), e);

                 }
             }
         }
                 }
             }
         }