X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed..a754eb6fafb568ef8904bf8b9276856e3dfd36e2:/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 b32d6633..8c89dd4f 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -3,21 +3,19 @@ package org.asamk.signal.commands;
 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.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 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.util.UUID;
-import java.util.stream.Collectors;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
@@ -39,29 +37,36 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         // Get a map of registration statuses
-        Map<String, Pair<String, UUID>> registered;
+        Map<String, UserStatus> registered;
         try {
-            registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient")));
+            registered = m.getUserStatus(new HashSet<>(ns.getList("recipient")));
         } catch (IOException e) {
-            throw new IOErrorException("Unable to check if users are registered", e);
+            throw new IOErrorException("Unable to check if users are registered: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
         }
 
         // Output
         if (outputWriter instanceof JsonWriter jsonWriter) {
 
             var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
-                final var number = entry.getValue().first();
-                final var uuid = entry.getValue().second();
+                final var number = entry.getValue().number();
+                final var uuid = entry.getValue().uuid();
                 return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
-            }).collect(Collectors.toList());
+            }).toList();
 
             jsonWriter.write(jsonUserStatuses);
         } else {
             final var writer = (PlainTextWriter) outputWriter;
 
             for (var entry : registered.entrySet()) {
-                final var uuid = entry.getValue().second();
-                writer.println("{}: {}", entry.getKey(), uuid != null);
+                final var userStatus = entry.getValue();
+                writer.println("{}: {}{}",
+                        entry.getKey(),
+                        userStatus.uuid() != null,
+                        userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
             }
         }
     }