X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/95792be9bcc1068c470630c13e0aebc55ed3bdc7..ce7aa580b6f0580cdcf7fd68fcc8efba737d21ed:/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 cf4be085..b32d6633 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -43,13 +43,11 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand { try { 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,26 +60,11 @@ 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 recipient; - - public final String number; - - public final String uuid; - - public final boolean isRegistered; - - public JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) { - this.recipient = recipient; - this.number = number; - this.uuid = uuid; - this.isRegistered = isRegistered; - } - } + private record JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) {} }