X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/357e278f48a6e1b3e3ab58f2ae34053ab1933b96..2016cf2a5fdf83310d78ca1672a313884880f26e:/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 e47728d5..6bc30698 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -11,10 +11,14 @@ 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.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
 
 import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 
@@ -23,6 +27,9 @@ public class QuitGroupCommand implements LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-g", "--group").required(true).help("Specify the recipient group ID.");
+        subparser.addArgument("--admin")
+                .nargs("*")
+                .help("Specify one or more members to make a group admin, required if you're currently the only admin.");
     }
 
     @Override
@@ -33,16 +40,23 @@ 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);
+            final var results = m.sendQuitGroupMessage(groupId,
+                    groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins));
             handleTimestampAndSendMessageResults(writer, results.first(), results.second());
         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: " + e.getMessage());
         } catch (GroupNotFoundException | 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());
         }
     }
 }