X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..5cccf521032954d7ad8e3f70e3cbef2ce1293e85:/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 53b64b8c..aad9a1e5 100644 --- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java +++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java @@ -3,14 +3,14 @@ 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.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.manager.StickerPackInvalidException; +import org.asamk.signal.manager.api.StickerPackInvalidException; +import org.asamk.signal.output.JsonWriter; +import org.asamk.signal.output.OutputWriter; +import org.asamk.signal.output.PlainTextWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,12 +42,11 @@ public class UploadStickerPackCommand implements JsonRpcLocalCommand { try { var url = m.uploadStickerPack(path); - if (outputWriter instanceof PlainTextWriter) { - final var writer = (PlainTextWriter) outputWriter; - writer.println("{}", url); + if (outputWriter instanceof PlainTextWriter writer) { + writer.println("{}", url.getUrl()); } else { final var writer = (JsonWriter) outputWriter; - writer.write(Map.of("url", url)); + writer.write(Map.of("url", url.getUrl())); } } catch (IOException e) { throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage(), e);