X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/48b2c7ff8ad7b653c3a0cb42775a5850f593d0a0..2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c:/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index e2ba2ff9..53b64b8c 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,8 +3,9 @@ package org.asamk.signal.commands;
 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.PlainTextWriterImpl;
+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;
@@ -15,32 +16,41 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Map;
 
-public class UploadStickerPackCommand implements LocalCommand {
+public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
-    private final OutputWriter outputWriter;
 
-    public UploadStickerPackCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
+    @Override
+    public String getName() {
+        return "uploadStickerPack";
     }
 
-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
         subparser.help("Upload a new sticker pack, consisting of a manifest file and the stickers images.");
         subparser.addArgument("path")
                 .help("The path of the manifest.json or a zip file containing the sticker pack you wish to upload.");
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        final var writer = (PlainTextWriterImpl) outputWriter;
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
         var path = new File(ns.getString("path"));
 
         try {
             var url = m.uploadStickerPack(path);
-            writer.println("{}", url);
+            if (outputWriter instanceof PlainTextWriter) {
+                final var writer = (PlainTextWriter) outputWriter;
+                writer.println("{}", url);
+            } else {
+                final var writer = (JsonWriter) outputWriter;
+                writer.write(Map.of("url", url));
+            }
         } catch (IOException e) {
-            throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage());
+            throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage(), e);
         } catch (StickerPackInvalidException e) {
             throw new UserErrorException("Invalid sticker pack: " + e.getMessage());
         }