Handle send failures as non fatal and return detailed results in json output

[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 67a6596b4a13e9b31b3092ecf02beb6ee870398d..6266a603c6de5136e535fac2941f54bfe418934b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -4,9 +4,6 @@ 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.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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;


@@ -14,14 +11,14 @@ import org.asamk.signal.manager.Manager;
 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.GroupNotFoundException;
 import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;

+import org.asamk.signal.output.OutputWriter;

 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

-import java.util.Map;

 
 

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

 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 
 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 


@@ -50,18 +47,16 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 

-        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getUsername());
+        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getSelfNumber());

 
         try {
             try {
                 final var results = m.quitGroup(groupId, groupAdmins);
 
         try {
             try {
                 final var results = m.quitGroup(groupId, groupAdmins);

-                final var timestamp = results.getTimestamp();
-                outputResult(outputWriter, timestamp);
-                handleSendMessageResults(results.getResults());
+                outputResult(outputWriter, results);

             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }

-            if (ns.getBoolean("delete")) {
+            if (Boolean.TRUE.equals(ns.getBoolean("delete"))) {

                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }
                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }


@@ -77,14 +72,4 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
             throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage());
         }
     }
             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));
-        }
-    }

 }
 }