Fix null pointer regression

[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 4bc209cd798c74a7e12a9f921c38611154e89759..eab4155c710beebd7536a2af53edacea91fa601c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,92 +1,126 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

-import net.sourceforge.argparse4j.impl.Arguments;
+import com.fasterxml.jackson.annotation.JsonInclude;
+

 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.OutputType;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameStatus;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.HashSet;
 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.Map;
 import java.util.Set;

-import java.util.stream.Collectors;
+import java.util.stream.Stream;

 
 

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

 
 

-    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);

 
     @Override
 
     @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("*");
+        subparser.addArgument("--username").help("Specify the recipient username or username link.").nargs("*");

     }
 
     @Override
     }
 
     @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");
-
-        // 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
+        Map<String, UserStatus> registered;
+        try {
+            final var recipient = ns.<String>getList("recipient");
+            registered = m.getUserStatus(recipient == null ? Set.of() : new HashSet<>(recipient));
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
+        } catch (IOException e) {
+            throw new IOErrorException("Unable to check if users are registered: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         }
 
         }
 

-        // Get a map of registration statuses
-        Map<String, Boolean> registered;
+        final var usernames = ns.<String>getList("username");
+        final Map<String, UsernameStatus> registeredUsernames;

         try {
         try {

-            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
+            registeredUsernames = usernames == null ? Map.of() : m.getUsernameStatus(new HashSet<>(usernames));

         } 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.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         }
 
         // Output
         }
 
         // Output

-        if (inJson) {
-            final JsonWriter jsonWriter = new JsonWriter(System.out);
-
-            List<JsonUserStatus> 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;
+        switch (outputWriter) {
+            case JsonWriter writer -> {
+                var jsonUserStatuses = Stream.concat(registered.entrySet().stream().map(entry -> {
+                    final var number = entry.getValue().number();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            number,
+                            null,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                }), registeredUsernames.entrySet().stream().map(entry -> {
+                    final var username = entry.getValue().username();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            null,
+                            username,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                })).toList();
+                writer.write(jsonUserStatuses);

             }
             }

-        } else {
-            for (Map.Entry<String, Boolean> entry : registered.entrySet()) {
-                System.out.println(entry.getKey() + ": " + entry.getValue());
+            case PlainTextWriter writer -> {
+                for (var entry : registered.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }
+                for (var entry : registeredUsernames.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }

             }
         }
             }
         }

-
-        return 0;

     }
 
     }
 

-    private static final class JsonUserStatus {
-
-        public String name;
-
-        public boolean isRegistered;
-
-        public JsonUserStatus(String name, boolean isRegistered) {
-            this.name = name;
-            this.isRegistered = isRegistered;
-        }
-    }
+    private record JsonUserStatus(
+            String recipient,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String number,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username,
+            String uuid,
+            boolean isRegistered
+    ) {}

 }
 }