X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/5d23b1ed9d222a3741bebff67e4af9b901a21b0e..f252597002c3c95e8ed68338c53a41d519b24dcd:/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 5ab237f9..70a55393 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -5,18 +5,20 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 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.api.Pair;
+import org.asamk.signal.manager.api.RateLimitException;
+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.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.UUID;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
@@ -38,9 +40,12 @@ 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 (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()
@@ -50,21 +55,26 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         }
 
         // 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();
-                return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
-            }).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);
+        switch (outputWriter) {
+            case JsonWriter writer -> {
+                var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
+                    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);
+                }).toList();
+                writer.write(jsonUserStatuses);
+            }
+            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)" : "");
+                }
             }
         }
     }