X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5bbfd3259891e18a11cb878e14a9c17990b13d79..ce70a623c21a267679d59838d041f9bc1d486cd9:/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 055dac9f..e5685f1a 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -31,7 +31,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Check if the specified phone number/s have been registered");
-        subparser.addArgument("number").help("Phone number").nargs("+");
+        subparser.addArgument("recipient").help("Phone number").nargs("+");
     }
 
     @Override
@@ -41,15 +41,13 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         // Get a map of registration statuses
         Map<String, Pair<String, UUID>> registered;
         try {
-            registered = m.areUsersRegistered(new HashSet<>(ns.getList("number")));
+            registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));
         } catch (IOException e) {
-            logger.debug("Failed to check registered users", e);
-            throw new IOErrorException("Unable to check if users are registered");
+            throw new IOErrorException("Unable to check if users are registered", e);
         }
 
         // Output
-        if (outputWriter instanceof JsonWriter) {
-            final var jsonWriter = (JsonWriter) outputWriter;
+        if (outputWriter instanceof JsonWriter jsonWriter) {
 
             var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
                 final var number = entry.getValue().first();
@@ -62,14 +60,15 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
             final var writer = (PlainTextWriter) outputWriter;
 
             for (var entry : registered.entrySet()) {
-                writer.println("{}: {}", entry.getKey(), entry.getValue());
+                final var uuid = entry.getValue().second();
+                writer.println("{}: {}", entry.getKey(), uuid != null);
             }
         }
     }
 
     private static final class JsonUserStatus {
 
-        public final String name;
+        public final String recipient;
 
         public final String number;
 
@@ -77,8 +76,8 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
         public final boolean isRegistered;
 
-        public JsonUserStatus(String name, String number, String uuid, 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;