X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/af292d8f0ea897ea13470489d51c40acca50fc3e..467a48bac508b56f84dce7ee0b81a22fd0d32161:/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 830147bc..c5b9d1ca 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.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 UnblockCommand implements JsonRpcLocalCommand {
 
@@ -35,26 +33,20 @@ public class UnblockCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        for (var contactNumber : ns.<String>getList("contact")) {
+        for (var contactNumber : CommandUtil.getSingleRecipientIdentifiers(ns.getList("contact"), m.getUsername())) {
             try {
                 m.setContactBlocked(contactNumber, false);
-            } catch (InvalidNumberException e) {
-                logger.warn("Invalid number: {}", contactNumber);
             } 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")) {
-                try {
-                    var groupId = Util.decodeGroupId(groupIdString);
-                    m.setGroupBlocked(groupId, false);
-                } catch (GroupIdFormatException e) {
-                    logger.warn("Invalid group id: {}", groupIdString);
-                } catch (GroupNotFoundException e) {
-                    logger.warn("Unknown group id: {}", groupIdString);
-                }
+        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);
             }
         }
     }