Align cli param names for recipient

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

diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index b4f6cc3b11025d5414c260e8cf28050b74ef2352..e931a60ee543958ef638931be21c0d1c9b6a6025 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -3,47 +3,51 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.manager.GroupNotFoundException;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.util.GroupIdFormatException;
-import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.asamk.signal.manager.NotMasterDeviceException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.util.CommandUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class UnblockCommand implements LocalCommand {
+public class UnblockCommand implements JsonRpcLocalCommand {
+
+    private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
+
+    @Override
+    public String getName() {
+        return "unblock";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("contact").help("Contact number").nargs("*");
-        subparser.addArgument("-g", "--group").help("Group ID").nargs("*");
         subparser.help("Unblock the given contacts or groups (messages will be received again)");
+        subparser.addArgument("recipient").help("Contact number").nargs("*");
+        subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
-        for (String contact_number : ns.<String>getList("contact")) {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        for (var contactNumber : CommandUtil.getSingleRecipientIdentifiers(ns.getList("recipient"), m.getUsername())) {
             try {
-                m.setContactBlocked(contact_number, false);
-            } catch (InvalidNumberException e) {
-                System.err.println(e.getMessage());
+                m.setContactBlocked(contactNumber, false);
+            } catch (NotMasterDeviceException e) {
+                throw new UserErrorException("This command doesn't work on linked devices.");
             }
         }
 
-        if (ns.<String>getList("group") != null) {
-            for (String groupIdString : ns.<String>getList("group")) {
-                try {
-                    byte[] groupId = Util.decodeGroupId(groupIdString);
-                    m.setGroupBlocked(groupId, false);
-                } catch (GroupIdFormatException | GroupNotFoundException e) {
-                    System.err.println(e.getMessage());
-                }
+        final var groupIdStrings = ns.<String>getList("group-id");
+        for (var groupId : CommandUtil.getGroupIds(groupIdStrings)) {
+            try {
+                m.setGroupBlocked(groupId, false);
+            } catch (GroupNotFoundException e) {
+                logger.warn("Unknown group id: {}", groupId);
             }
         }
-
-        return 0;
     }
 }