X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/03bf0439593dc1c5e02bdd49e18d649d1c24e721..c6395b9f35a4229d297aef063597bc96919a7f36:/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 103d1027..07de8321 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -6,14 +6,15 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
+import org.asamk.signal.PlainTextWriterImpl;
 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.Set;
 import java.util.stream.Collectors;
 
 public class GetUserStatusCommand implements LocalCommand {
@@ -29,10 +30,15 @@ public class GetUserStatusCommand implements LocalCommand {
                 .action(Arguments.storeTrue());
     }
 
+    @Override
+    public Set<OutputType> getSupportedOutputTypes() {
+        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    }
+
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
         // Setup the json object mapper
-        boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
+        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
 
         // TODO delete later when "json" variable is removed
         if (ns.getBoolean("json")) {
@@ -50,9 +56,9 @@ public class GetUserStatusCommand implements LocalCommand {
 
         // Output
         if (inJson) {
-            final JsonWriter jsonWriter = new JsonWriter(System.out);
+            final var jsonWriter = new JsonWriter(System.out);
 
-            List<JsonUserStatus> jsonUserStatuses = registered.entrySet()
+            var jsonUserStatuses = registered.entrySet()
                     .stream()
                     .map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))
                     .collect(Collectors.toList());
@@ -64,8 +70,15 @@ public class GetUserStatusCommand implements LocalCommand {
                 return 3;
             }
         } else {
-            for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
-                System.out.println(entry.getKey() + ": " + entry.getValue());
+            final var writer = new PlainTextWriterImpl(System.out);
+
+            try {
+                for (var entry : registered.entrySet()) {
+                    writer.println("{}: {}", entry.getKey(), entry.getValue());
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                return 3;
             }
         }