X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..87406e2cdb4cb65a50202792350657457801c235:/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 d8a86585..0a53c638 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.commands;
 
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
@@ -11,19 +12,33 @@ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 
 public class QuitGroupCommand implements LocalCommand {
 
+    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+
     @Override
     public 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").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
@@ -34,21 +49,31 @@ public class QuitGroupCommand implements LocalCommand {
         try {
             groupId = Util.decodeGroupId(ns.getString("group"));
         } catch (GroupIdFormatException e) {
-            throw new UserErrorException("Invalid group id:" + e.getMessage());
+            throw new UserErrorException("Invalid group id: " + e.getMessage());
         }
 
+        var groupAdmins = ns.<String>getList("admin");
+
         try {
-            final var results = m.sendQuitGroupMessage(groupId);
-            handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+            try {
+                final var results = m.sendQuitGroupMessage(groupId,
+                        groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins));
+                handleTimestampAndSendMessageResults(writer, results.first(), 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) {
             throw new IOErrorException("Failed to send message: " + e.getMessage());
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            throw e;
         } catch (GroupNotFoundException e) {
             throw new UserErrorException("Failed to send to group: " + e.getMessage());
-        } catch (NotAGroupMemberException e) {
-            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());
         }
     }
 }