X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/28f735741a26c571da59323f0faceee95b055e3b..ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed:/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index abe4e74d..ccf32771 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -5,32 +5,33 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.OutputType;
+import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.Util;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>, LocalCommand {
 
     default TypeReference<Map<String, Object>> getRequestType() {
-        return new TypeReference<>() {
-        };
+        return new TypeReference<>() {};
     }
 
-    default void handleCommand(Map<String, Object> request, Manager m) throws CommandException {
+    default void handleCommand(
+            Map<String, Object> request, Manager m, OutputWriter outputWriter
+    ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
-        handleCommand(commandNamespace, m);
+        handleCommand(commandNamespace, m, outputWriter);
     }
 
-    default Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    default List<OutputType> getSupportedOutputTypes() {
+        return List.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 
     /**
-     * Namepace implementation, that defaults booleans to false and converts camel case keys to dashed strings
+     * Namespace implementation, that has plural handling for list arguments and converts camel case keys to dashed strings
      */
     final class JsonRpcNamespace extends Namespace {
 
@@ -38,6 +39,7 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
             super(attrs);
         }
 
+        @Override
         public <T> T get(String dest) {
             final T value = super.get(dest);
             if (value != null) {
@@ -50,21 +52,16 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
 
         @Override
         public <E> List<E> getList(final String dest) {
-            final List<E> value = super.getList(dest);
-            if (value != null) {
-                return value;
+            try {
+                final List<E> value = super.getList(dest);
+                if (value != null) {
+                    return value;
+                }
+            } catch (ClassCastException e) {
+                return List.of(this.<E>get(dest));
             }
 
             return super.getList(dest + "s");
         }
-
-        @Override
-        public Boolean getBoolean(String dest) {
-            Boolean maybeGotten = this.get(dest);
-            if (maybeGotten == null) {
-                maybeGotten = false;
-            }
-            return maybeGotten;
-        }
     }
 }