X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/90f5cd79c982c9d9f5f5103ca9af4ee289ee9ba1..b24fa98e3c0d7d5e122c718daff854bbd1071899:/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 8078de10..91e6e47c 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,87 +1,73 @@
 package org.asamk.signal.commands;
 
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-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;
+import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class GetUserStatusCommand implements LocalCommand {
+public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
-    // TODO delete later when "json" variable is removed
-    final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private final OutputWriter outputWriter;
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("number").help("Phone number").nargs("+");
+    public static void attachToSubparser(final Subparser subparser) {
         subparser.help("Check if the specified phone number/s have been registered");
-        subparser.addArgument("--json")
-                .help("WARNING: This parameter is now deprecated! Please use the \"output\" option instead.\n\nOutput received messages in json format, one json object per line.")
-                .action(Arguments.storeTrue());
+        subparser.addArgument("number").help("Phone number").nargs("+");
     }
 
-    @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        // Setup the json object mapper
-        ObjectMapper jsonProcessor = new ObjectMapper();
-        jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
-
-        boolean inJson = ns.getString("output").equals("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
-        }
+    public GetUserStatusCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
 
+    @Override
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         // Get a map of registration statuses
         Map<String, Boolean> registered;
         try {
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
         } catch (IOException e) {
-            System.err.println("Unable to check if users are registered");
-            return 1;
+            logger.debug("Failed to check registered users", e);
+            throw new IOErrorException("Unable to check if users are registered");
         }
 
         // Output
-        if (inJson) {
-            List<JsonIsRegistered> objects = registered.entrySet()
+        if (outputWriter instanceof JsonWriter) {
+            final var jsonWriter = (JsonWriter) outputWriter;
+
+            var jsonUserStatuses = registered.entrySet()
                     .stream()
-                    .map(entry -> new JsonIsRegistered(entry.getKey(), entry.getValue()))
+                    .map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))
                     .collect(Collectors.toList());
 
-            try {
-                jsonProcessor.writeValue(System.out, objects);
-                System.out.println();
-            } catch (IOException e) {
-                System.err.println(e.getMessage());
-            }
+            jsonWriter.write(jsonUserStatuses);
         } else {
-            for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
-                System.out.println(entry.getKey() + ": " + entry.getValue());
+            final var writer = (PlainTextWriter) outputWriter;
+
+            for (var entry : registered.entrySet()) {
+                writer.println("{}: {}", entry.getKey(), entry.getValue());
             }
         }
-
-        return 0;
     }
 
-    private static final class JsonIsRegistered {
+    private static final class JsonUserStatus {
 
         public String name;
 
         public boolean isRegistered;
 
-        public JsonIsRegistered(String name, boolean isRegistered) {
+        public JsonUserStatus(String name, boolean isRegistered) {
             this.name = name;
             this.isRegistered = isRegistered;
         }