X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..8d55dfb66bc0dfbd2b601a27075f2876cde918e3:/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 f5585881..7a5b2601 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,24 +3,23 @@ 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.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.groups.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.PendingAdminApprovalException;
+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.handleSendMessageResults;
-
 public class JoinGroupCommand implements JsonRpcLocalCommand {
 
     @Override
@@ -55,24 +54,39 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
-            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()));
+            switch (outputWriter) {
+                case 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 {
-                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());
+                case PlainTextWriter writer -> {
+                    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());
                 }
             }
-            handleSendMessageResults(results.second().getResults());
-        } 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()
@@ -82,8 +96,10 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         } catch (DBusExecutionException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);
-        } catch (GroupLinkNotActiveException 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());
         }
     }
 }