Update libsignal-service-java

[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 bcd88ab415265b849a02408e76e201599e097d72..5e3461b7a6c3ddb079914cc563a0af91fc026089 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,30 +3,40 @@ 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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-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;
+public class JoinGroupCommand implements JsonRpcLocalCommand {
 
-public class JoinGroupCommand implements LocalCommand {
+    @Override
+    public String getName() {
+        return "joinGroup";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Join a group via an invitation link.");
         subparser.addArgument("--uri").required(true).help("Specify the uri with the group invitation link.");
     }
 
     @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 {
@@ -42,24 +52,51 @@ 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.getSelfAddress())) {
-                writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+            if (outputWriter instanceof JsonWriter writer) {
+                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
+                if (!m.getGroup(newGroupId).isMember()) {
+                    writer.write(Map.of("timestamp",
+                            results.second().timestamp(),
+                            "results",
+                            jsonResults,
+                            "groupId",
+                            newGroupId.toBase64(),
+                            "onlyRequested",
+                            true));
+                } else {
+                    writer.write(Map.of("timestamp",
+                            results.second().timestamp(),
+                            "results",
+                            jsonResults,
+                            "groupId",
+                            newGroupId.toBase64()));
+                }
             } else {
-                writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                final var writer = (PlainTextWriter) outputWriter;
+                if (!m.getGroup(newGroupId).isMember()) {
+                    writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+                } else {
+                    writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                }
+                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second().results());
+                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                writer.println("{}", results.second().timestamp());
             }
-            handleTimestampAndSendMessageResults(writer, 0, results.second());
-        } catch (GroupPatchNotAcceptedException e) {
-            throw new UserErrorException("Failed to join group, maybe already a member");
         } catch (IOException e) {
-            throw new IOErrorException("Failed to send message: " + e.getMessage());
+            throw new IOErrorException("Failed to send message: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
         } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
-        } catch (GroupLinkNotActiveException e) {
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")", e);
+        } catch (InactiveGroupLinkException e) {
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
+        } catch (PendingAdminApprovalException e) {
+            throw new UserErrorException("Pending admin approval: " + e.getMessage());
         }
     }
 }