Update gradle

[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 2a8a9c8f5812fb3cf3503d45c28f81982829ca8c..1ecc5aca3159c98d5fad647c0c5f6712d6632dbe 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,69 +3,100 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
-import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;
+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 java.io.IOException;
 
 import java.io.IOException;

+import java.util.Map;

 
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleIOException;
-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) {
 
     @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
         subparser.addArgument("--uri").required(true).help("Specify the uri with the group invitation link.");
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {

         final GroupInviteLinkUrl linkUrl;
         var uri = ns.getString("uri");
         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {
         final GroupInviteLinkUrl linkUrl;
         var uri = ns.getString("uri");
         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {

-            System.err.println("Group link is invalid: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Group link is invalid: " + e.getMessage());

         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
         } catch (GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {

-            System.err.println("Group link was created with an incompatible version: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Group link was created with an incompatible version: " + e.getMessage());

         }
 
         if (linkUrl == null) {
         }
 
         if (linkUrl == null) {

-            System.err.println("Link is not a signal group invitation link");
-            return 1;
+            throw new UserErrorException("Link is not a signal group invitation link");

         }
 
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
         }
 
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();

-            if (!m.getGroup(newGroupId).isMember(m.getSelfAddress())) {
-                System.out.println("Requested to join group \"" + newGroupId.toBase64() + "\"");
-            } else {
-                System.out.println("Joined group \"" + 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()));
+                    }
+                }
+                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());
+                }

             }
             }

-            return handleTimestampAndSendMessageResults(0, results.second());
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
-        } catch (GroupPatchNotAcceptedException e) {
-            System.err.println("Failed to join group, maybe already a member");
-            return 1;

         } catch (IOException e) {
         } catch (IOException e) {

-            e.printStackTrace();
-            handleIOException(e);
-            return 3;
-        } catch (DBusExecutionException e) {
-            System.err.println("Failed to send message: " + e.getMessage());
-            return 2;
-        } catch (GroupLinkNotActiveException e) {
-            System.err.println("Group link is not valid: " + e.getMessage());
-            return 1;
+            throw new IOErrorException("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());

         }
     }
 }
         }
     }
 }