Use Java 17

[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 07de8321759d601b30ef7c7370a28b26f01b0b84..e5685f1a7be8fa6f96ce2c11e286770d9a2aebde 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,98 +1,85 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import net.sourceforge.argparse4j.impl.Arguments;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.JsonWriter;
 import net.sourceforge.argparse4j.inf.Namespace;
 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.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.util.Map;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;

-import java.util.Set;
+import java.util.UUID;

 import java.util.stream.Collectors;
 
 import java.util.stream.Collectors;
 

-public class GetUserStatusCommand implements LocalCommand {
+public class GetUserStatusCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
 
     @Override
 
     private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
 
     @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.addArgument("--json")
-                .help("WARNING: This parameter is now deprecated! Please use the global \"--output=json\" option instead.\n\nOutput received messages in json format, one json object per line.")
-                .action(Arguments.storeTrue());
+    public String getName() {
+        return "getUserStatus";

     }
 
     @Override
     }
 
     @Override

-    public Set<OutputType> getSupportedOutputTypes() {
-        return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Check if the specified phone number/s have been registered");
+        subparser.addArgument("recipient").help("Phone number").nargs("+");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        // Setup the json object mapper
-        var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
-
-        // TODO delete later when "json" variable is removed
-        if (ns.getBoolean("json")) {
-            logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" 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 {
         try {

-            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
+            registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));

         } catch (IOException e) {
         } catch (IOException e) {

-            System.err.println("Unable to check if users are registered");
-            return 3;
+            throw new IOErrorException("Unable to check if users are registered", e);

         }
 
         // Output
         }
 
         // Output

-        if (inJson) {
-            final var jsonWriter = new JsonWriter(System.out);
-
-            var jsonUserStatuses = registered.entrySet()
-                    .stream()
-                    .map(entry -> new JsonUserStatus(entry.getKey(), entry.getValue()))
-                    .collect(Collectors.toList());
-
-            try {
-                jsonWriter.write(jsonUserStatuses);
-            } catch (IOException e) {
-                logger.error("Failed to write json object: {}", e.getMessage());
-                return 3;
-            }
+        if (outputWriter instanceof JsonWriter jsonWriter) {
+
+            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 {

-            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;
+            final var writer = (PlainTextWriter) outputWriter;
+
+            for (var entry : registered.entrySet()) {
+                final var uuid = entry.getValue().second();
+                writer.println("{}: {}", entry.getKey(), uuid != null);

             }
         }
             }
         }

-
-        return 0;

     }
 
     private static final class JsonUserStatus {
 
     }
 
     private static final class JsonUserStatus {
 

-        public String name;
+        public final String recipient;
+
+        public final String number;
+
+        public final String uuid;

 
 

-        public boolean isRegistered;
+        public final boolean isRegistered;

 
 

-        public JsonUserStatus(String name, boolean isRegistered) {
-            this.name = name;
+        public JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) {
+            this.recipient = recipient;
+            this.number = number;
+            this.uuid = uuid;

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