Implement JsonRpc command for commands without output

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

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index 1bde1120ba8f9d980c1e76b2b92fd6b666dd2ebe..0a0df3460804b9b0eed3b3710fe997854a18c33e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -1,55 +1,86 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import net.sourceforge.argparse4j.impl.Arguments;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;

-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.LastGroupAdminException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;

 import org.asamk.signal.util.Util;
 import org.asamk.signal.util.Util;

-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 import java.io.IOException;
 
 import java.io.IOException;

+import java.util.HashSet;
+import java.util.Set;

 
 

-import static org.asamk.signal.util.ErrorUtils.*;
+import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;

 
 public class QuitGroupCommand implements LocalCommand {
 
 
 public class QuitGroupCommand implements LocalCommand {
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-g", "--group")
-                .required(true)
-                .help("Specify the recipient group ID.");
+    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+    private final OutputWriter outputWriter;
+
+    public QuitGroupCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
+        subparser.help("Send a quit group message to all group members and remove self from member list.");
+        subparser.addArgument("-g", "--group-id", "--group").required(true).help("Specify the recipient group ID.");
+        subparser.addArgument("--delete")
+                .action(Arguments.storeTrue())
+                .help("Delete local group data completely after quitting group.");
+        subparser.addArgument("--admin")
+                .nargs("*")
+                .help("Specify one or more members to make a group admin, required if you're currently the only admin.");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        final var writer = (PlainTextWriter) outputWriter;
+
+        final GroupId groupId;
+        try {
+            groupId = Util.decodeGroupId(ns.getString("group-id"));
+        } catch (GroupIdFormatException e) {
+            throw new UserErrorException("Invalid group id: " + e.getMessage());

         }
 
         }
 

+        var groupAdmins = ns.<String>getList("admin");
+

         try {
         try {

-            m.sendQuitGroupMessage(Util.decodeGroupId(ns.getString("group")));
-            return 0;
+            try {
+                final var results = m.sendQuitGroupMessage(groupId,
+                        groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins));
+                final var timestamp = results.first();
+                writer.println("{}", timestamp);
+                handleTimestampAndSendMessageResults(results.second());
+            } catch (NotAGroupMemberException e) {
+                logger.info("User is not a group member");
+            }
+            if (ns.getBoolean("delete")) {
+                logger.debug("Deleting group {}", groupId);
+                m.deleteGroup(groupId);
+            }

         } catch (IOException e) {
         } catch (IOException e) {

-            handleIOException(e);
-            return 3;
-        } catch (EncapsulatedExceptions e) {
-            handleEncapsulatedExceptions(e);
-            return 3;
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
+            throw new IOErrorException("Failed to send message: " + e.getMessage());

         } catch (GroupNotFoundException e) {
         } catch (GroupNotFoundException e) {

-            handleGroupNotFoundException(e);
-            return 1;
-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
-            return 1;
+            throw new UserErrorException("Failed to send to group: " + e.getMessage());
+        } catch (InvalidNumberException e) {
+            throw new UserErrorException("Failed to parse admin number: " + e.getMessage());
+        } catch (LastGroupAdminException e) {
+            throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage());

         }
     }
 }
         }
     }
 }