Handle queued actions also when thread is interrupted

[signal-cli] / 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 8078de107d8852d593281087fb1e96a9c22e0715..055dac9f4a7adc4f30a454e27e6e106da564232b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,88 +1,86 @@
 package org.asamk.signal.commands;
 
 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 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 org.asamk.signal.manager.Manager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import org.whispersystems.libsignal.util.Pair;

 
 import java.io.IOException;
 import java.util.HashSet;
 
 import java.io.IOException;
 import java.util.HashSet;

-import java.util.List;

 import java.util.Map;
 import java.util.Map;

+import java.util.UUID;

 import java.util.stream.Collectors;
 
 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);
+
+    @Override
+    public String getName() {
+        return "getUserStatus";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("number").help("Phone number").nargs("+");

         subparser.help("Check if the specified phone number/s have been registered");
         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
     }
 
     @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 void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         // Get a map of registration statuses
         // Get a map of registration statuses

-        Map<String, Boolean> registered;
+        Map<String, Pair<String, UUID>> registered;

         try {
             registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
         } catch (IOException e) {
         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
         }
 
         // Output

-        if (inJson) {
-            List<JsonIsRegistered> objects = registered.entrySet()
-                    .stream()
-                    .map(entry -> new JsonIsRegistered(entry.getKey(), entry.getValue()))
-                    .collect(Collectors.toList());
-
-            try {
-                jsonProcessor.writeValue(System.out, objects);
-                System.out.println();
-            } catch (IOException e) {
-                System.err.println(e.getMessage());
-            }
+        if (outputWriter instanceof JsonWriter) {
+            final var jsonWriter = (JsonWriter) outputWriter;
+
+            var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
+                final var number = entry.getValue().first();
+                final var uuid = entry.getValue().second();
+                return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
+            }).collect(Collectors.toList());
+
+            jsonWriter.write(jsonUserStatuses);

         } else {
         } 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 final String name;
+
+        public final String number;

 
 

-        public String name;
+        public final String uuid;

 
 

-        public boolean isRegistered;
+        public final boolean isRegistered;

 
 

-        public JsonIsRegistered(String name, boolean isRegistered) {
+        public JsonUserStatus(String name, String number, String uuid, boolean isRegistered) {

             this.name = name;
             this.name = name;

+            this.number = number;
+            this.uuid = uuid;

             this.isRegistered = isRegistered;
         }
     }
             this.isRegistered = isRegistered;
         }
     }