Align cli param names for recipient

[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 0710a7e5cb9d8386e6c1779397410ed97f38f4e3..105c2016969d89066fb12adee15e92a4b6a36fac 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -8,12 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.NotMasterDeviceException;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.util.Util;
+import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 public class BlockCommand implements JsonRpcLocalCommand {
 
@@ -27,7 +25,7 @@ public class BlockCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Block the given contacts or groups (no messages will be received)");
-        subparser.addArgument("contact").help("Contact number").nargs("*");
+        subparser.addArgument("recipient").help("Contact number").nargs("*");
         subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*");
     }
 
@@ -35,23 +33,22 @@ public class BlockCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        for (var contactNumber : ns.<String>getList("contact")) {
+        final var contacts = ns.<String>getList("recipient");
+        for (var contact : CommandUtil.getSingleRecipientIdentifiers(contacts, m.getUsername())) {
             try {
-                m.setContactBlocked(contactNumber, true);
-            } catch (InvalidNumberException e) {
-                logger.warn("Invalid number {}: {}", contactNumber, e.getMessage());
+                m.setContactBlocked(contact, true);
             } catch (NotMasterDeviceException e) {
                 throw new UserErrorException("This command doesn't work on linked devices.");
             }
         }
 
-        if (ns.<String>getList("group-id") != null) {
-            for (var groupIdString : ns.<String>getList("group-id")) {
+        final var groupIdStrings = ns.<String>getList("group-id");
+        if (groupIdStrings != null) {
+            for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {
                 try {
-                    var groupId = Util.decodeGroupId(groupIdString);
                     m.setGroupBlocked(groupId, true);
-                } catch (GroupIdFormatException | GroupNotFoundException e) {
-                    logger.warn("Invalid group id {}: {}", groupIdString, e.getMessage());
+                } catch (GroupNotFoundException e) {
+                    logger.warn("Group not found {}: {}", groupId.toBase64(), e.getMessage());
                 }
             }
         }