Fix JsonRpcLocalCommand interface

[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 e62bb79a946b1221271dd5f6f3216c9d04595ee4..7229c2e1b89ae21a7f40ac8fbb0195666d67bd1e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -15,14 +15,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 

-public class BlockCommand implements LocalCommand {
+public class BlockCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
     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("*");
 
     private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
     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").help("Group ID").nargs("*");
+        subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*");

     }
 
     public BlockCommand(final OutputWriter outputWriter) {
     }
 
     public BlockCommand(final OutputWriter outputWriter) {


@@ -40,8 +40,8 @@ public class BlockCommand implements LocalCommand {
             }
         }
 
             }
         }
 

-        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);
                 try {
                     var groupId = Util.decodeGroupId(groupIdString);
                     m.setGroupBlocked(groupId, true);