Add json output listContacts command

[signal-cli] / src / main / java / org / asamk / signal / commands / ListContactsCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index aaf0e0b3f378f0394ccf7986fa6a1688a0ac50e3..b39f9ec901d21c4941fc8379e3478a5103b997bf 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -3,13 +3,17 @@ 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.manager.Manager;
 
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import static org.asamk.signal.util.Util.getLegacyIdentifier;
 
-public class ListContactsCommand implements LocalCommand {
+public class ListContactsCommand implements JsonRpcLocalCommand {
 
     @Override
     public String getName() {
@@ -23,14 +27,56 @@ public class ListContactsCommand implements LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m, final OutputWriter outputWriter) {
-        final var writer = (PlainTextWriter) outputWriter;
-
         var contacts = m.getContacts();
-        for (var c : contacts) {
-            writer.println("Number: {} Name: {} Blocked: {}",
-                    getLegacyIdentifier(m.resolveSignalServiceAddress(c.first())),
-                    c.second().getName(),
-                    c.second().isBlocked());
+
+        if (outputWriter instanceof PlainTextWriter) {
+            final var writer = (PlainTextWriter) outputWriter;
+            for (var c : contacts) {
+                final var contact = c.second();
+                writer.println("Number: {} Name: {} Blocked: {} Message expiration: {}",
+                        getLegacyIdentifier(m.resolveSignalServiceAddress(c.first())),
+                        contact.getName(),
+                        contact.isBlocked(),
+                        contact.getMessageExpirationTime() == 0
+                                ? "disabled"
+                                : contact.getMessageExpirationTime() + "s");
+            }
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            final var jsonContacts = contacts.stream().map(contactPair -> {
+                final var address = m.resolveSignalServiceAddress(contactPair.first());
+                final var contact = contactPair.second();
+                return new JsonContact(address.getNumber().orNull(),
+                        address.getUuid().transform(UUID::toString).orNull(),
+                        contact.getName(),
+                        contact.isBlocked(),
+                        contact.getMessageExpirationTime());
+            }).collect(Collectors.toList());
+
+            writer.write(jsonContacts);
+        }
+    }
+
+    private static final class JsonContact {
+
+        public final String number;
+        public final String uuid;
+        public final String name;
+        public final boolean isBlocked;
+        public final int messageExpirationTime;
+
+        private JsonContact(
+                final String number,
+                final String uuid,
+                final String name,
+                final boolean isBlocked,
+                final int messageExpirationTime
+        ) {
+            this.number = number;
+            this.uuid = uuid;
+            this.name = name;
+            this.isBlocked = isBlocked;
+            this.messageExpirationTime = messageExpirationTime;
         }
     }
 }