Use Java 17

[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 e47728d5278f49e69c3778e4795c48dc1112d4ee..8c3ac3bd206f70514a77364788aaa8d6dd27262e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -1,48 +1,89 @@
 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.PlainTextWriterImpl;
+import org.asamk.signal.JsonWriter;
+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.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.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.manager.groups.GroupNotFoundException;
 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.manager.groups.NotAGroupMemberException;

-import org.asamk.signal.util.Util;
+import org.asamk.signal.util.CommandUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

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

+import java.util.Map;

 
 

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

 
 

-public class QuitGroupCommand implements LocalCommand {
+public class QuitGroupCommand implements JsonRpcLocalCommand {
+
+    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+
+    @Override
+    public String getName() {
+        return "quitGroup";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-g", "--group").required(true).help("Specify the recipient group ID.");
+        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 void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        final var writer = new PlainTextWriterImpl(System.out);
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));

 
 

-        final GroupId groupId;
-        try {
-            groupId = Util.decodeGroupId(ns.getString("group"));
-        } catch (GroupIdFormatException e) {
-            throw new UserErrorException("Invalid group id:" + e.getMessage());
-        }
+        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getSelfNumber());

 
         try {
 
         try {

-            final var results = m.sendQuitGroupMessage(groupId);
-            handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+            try {
+                final var results = m.quitGroup(groupId, groupAdmins);
+                final var timestamp = results.getTimestamp();
+                outputResult(outputWriter, timestamp);
+                handleSendMessageResults(results.getResults());
+            } catch (NotAGroupMemberException e) {
+                logger.info("User is not a group member");
+            }
+            if (Boolean.TRUE.equals(ns.getBoolean("delete"))) {
+                logger.debug("Deleting group {}", groupId);
+                m.deleteGroup(groupId);
+            }

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

-            throw new IOErrorException("Failed to send message: " + e.getMessage());
-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            throw new IOErrorException("Failed to send message: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
+        } catch (GroupNotFoundException e) {

             throw new UserErrorException("Failed to send to group: " + e.getMessage());
             throw new UserErrorException("Failed to send to group: " + e.getMessage());

+        } catch (LastGroupAdminException e) {
+            throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage());
+        }
+    }
+
+    private void outputResult(final OutputWriter outputWriter, final long timestamp) {
+        if (outputWriter instanceof PlainTextWriter writer) {
+            writer.println("{}", timestamp);
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            writer.write(Map.of("timestamp", timestamp));

         }
     }
 }
         }
     }
 }