X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/15e802971524cc061b72a1c5335140f517dd8f03..af292d8f0ea897ea13470489d51c40acca50fc3e:/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 ee64bac5..c5c7472c 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -4,6 +4,7 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputWriter;
 import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
@@ -22,22 +23,24 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
-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);
-    private final OutputWriter outputWriter;
 
-    public QuitGroupCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
+    @Override
+    public String getName() {
+        return "quitGroup";
     }
 
-    public static 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-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.");
@@ -47,12 +50,12 @@ public class QuitGroupCommand implements LocalCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        final var writer = (PlainTextWriter) outputWriter;
-
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
         final GroupId groupId;
         try {
-            groupId = Util.decodeGroupId(ns.getString("group"));
+            groupId = Util.decodeGroupId(ns.getString("group-id"));
         } catch (GroupIdFormatException e) {
             throw new UserErrorException("Invalid group id: " + e.getMessage());
         }
@@ -63,7 +66,9 @@ public class QuitGroupCommand implements LocalCommand {
             try {
                 final var results = m.sendQuitGroupMessage(groupId,
                         groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins));
-                handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+                final var timestamp = results.first();
+                outputResult(outputWriter, timestamp);
+                handleSendMessageResults(results.second());
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }
@@ -81,4 +86,14 @@ public class QuitGroupCommand implements LocalCommand {
             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) {
+            final var writer = (PlainTextWriter) outputWriter;
+            writer.println("{}", timestamp);
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            writer.write(Map.of("timestamp", timestamp));
+        }
+    }
 }