Print message expiration time in listGroups command

[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..0710a7e5cb9d8386e6c1779397410ed97f38f4e3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -15,21 +15,26 @@ 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);
 
 
     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("*");
+    @Override
+    public String getName() {
+        return "block";

     }
 
     }
 

-    public BlockCommand(final OutputWriter outputWriter) {
+    @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("-g", "--group-id", "--group").help("Group ID").nargs("*");

     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         for (var contactNumber : ns.<String>getList("contact")) {
             try {
                 m.setContactBlocked(contactNumber, true);
         for (var contactNumber : ns.<String>getList("contact")) {
             try {
                 m.setContactBlocked(contactNumber, true);


@@ -40,8 +45,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);