X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/36475bb632316d0333f1c44f6639c4f63007bdce..6826e3cb49f42142d5d3201a7425a2180f496216:/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 19466c58..29a1f3e5 100644
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -3,6 +3,7 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+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;
@@ -18,27 +19,29 @@ public class BlockCommand implements LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("contact").help("Contact number").nargs("*");
-        subparser.addArgument("-g", "--group").help("Group ID").nargs("*");
+    public static 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("-g", "--group-id", "--group").help("Group ID").nargs("*");
+    }
+
+    public BlockCommand(final OutputWriter outputWriter) {
     }
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        for (var contact_number : ns.<String>getList("contact")) {
+        for (var contactNumber : ns.<String>getList("contact")) {
             try {
-                m.setContactBlocked(contact_number, true);
+                m.setContactBlocked(contactNumber, true);
             } catch (InvalidNumberException e) {
-                logger.warn("Invalid number {}: {}", contact_number, e.getMessage());
+                logger.warn("Invalid number {}: {}", contactNumber, e.getMessage());
             } catch (NotMasterDeviceException e) {
                 throw new UserErrorException("This command doesn't work on linked devices.");
             }
         }
 
-        if (ns.<String>getList("group") != null) {
-            for (var groupIdString : ns.<String>getList("group")) {
+        if (ns.<String>getList("group-id") != null) {
+            for (var groupIdString : ns.<String>getList("group-id")) {
                 try {
                     var groupId = Util.decodeGroupId(groupIdString);
                     m.setGroupBlocked(groupId, true);