Refactor JsonRpcReader to for handling a single message

[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 055dac9f4a7adc4f30a454e27e6e106da564232b..8c89dd4fd64966a44106d59a320e2255d0274287 100644 (file)
--- 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 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.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.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.UUID;
-import java.util.stream.Collectors;

 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 


@@ -31,7 +29,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");
     @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
     }
 
     @Override


@@ -39,49 +37,39 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         // Get a map of registration statuses
             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 {
         try {

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

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

         }
 
         // Output
         }
 
         // Output

-        if (outputWriter instanceof JsonWriter) {
-            final var jsonWriter = (JsonWriter) outputWriter;
+        if (outputWriter instanceof JsonWriter jsonWriter) {

 
             var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
 
             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);
                 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()) {
 
             jsonWriter.write(jsonUserStatuses);
         } else {
             final var writer = (PlainTextWriter) outputWriter;
 
             for (var entry : registered.entrySet()) {

-                writer.println("{}: {}", entry.getKey(), entry.getValue());
+                final var userStatus = entry.getValue();
+                writer.println("{}: {}{}",
+                        entry.getKey(),
+                        userStatus.uuid() != null,
+                        userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");

             }
         }
     }
 
             }
         }
     }
 

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

 }
 }