Fix error message

[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 435d1896585e0a50991fa0c59d86731360e0252d..488c4100effe92522ed199ac4bee7d4ea218c25d 100644 (file)
--- 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.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.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.util.Util;

+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.handleTimestampAndSendMessageResults;
 
 
 import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 


@@ -22,7 +26,11 @@ public class QuitGroupCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @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("-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
     }
 
     @Override


@@ -36,13 +44,20 @@ public class QuitGroupCommand implements LocalCommand {
             throw new UserErrorException("Invalid group id: " + e.getMessage());
         }
 
             throw new UserErrorException("Invalid group id: " + e.getMessage());
         }
 

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

         try {
         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());
             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());

         }
     }
 }
         }
     }
 }