Add RecipientIdentifier as external Manager interface

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

diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index d501c398b775f7099f531baf911a534f39169f73..8d651592ee57782426b3500fea0a0c0977849ff9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,7 +3,9 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.PlainTextWriterImpl;
+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.commands.exceptions.UnexpectedErrorException;
@@ -15,10 +17,16 @@ import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException
 import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;
 
 import java.io.IOException;
+import java.util.Map;
 
-import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
+import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;
 
-public class JoinGroupCommand implements LocalCommand {
+public class JoinGroupCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "joinGroup";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
@@ -27,7 +35,9 @@ public class JoinGroupCommand implements LocalCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
         final GroupInviteLinkUrl linkUrl;
         var uri = ns.getString("uri");
         try {
@@ -43,16 +53,24 @@ public class JoinGroupCommand implements LocalCommand {
         }
 
         try {
-            final var writer = new PlainTextWriterImpl(System.out);
-
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
-            if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
-                writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+            if (outputWriter instanceof JsonWriter) {
+                final var writer = (JsonWriter) outputWriter;
+                if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
+                    writer.write(Map.of("groupId", newGroupId.toBase64(), "onlyRequested", true));
+                } else {
+                    writer.write(Map.of("groupId", newGroupId.toBase64()));
+                }
             } else {
-                writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                final var writer = (PlainTextWriter) outputWriter;
+                if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
+                    writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+                } else {
+                    writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                }
             }
-            handleTimestampAndSendMessageResults(writer, 0, results.second());
+            handleSendMessageResults(results.second().getResults());
         } catch (GroupPatchNotAcceptedException e) {
             throw new UserErrorException("Failed to join group, maybe already a member");
         } catch (IOException e) {