Use Java 17

[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 62b996cfda8c982cbdff1fb033cf917f70f5159b..892879f6c01f4757f9f52a07b16b6ea2fbfee10c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,82 +3,86 @@ 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;
-import org.asamk.signal.manager.GroupInviteLinkUrl;
+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.Manager;

+import org.asamk.signal.manager.groups.GroupInviteLinkUrl;

 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.libsignal.util.Pair;

 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;

-import org.whispersystems.signalservice.api.messages.SendMessageResult;

 import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;
 import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAcceptedException;

-import org.whispersystems.util.Base64;

 
 import java.io.IOException;
 
 import java.io.IOException;

-import java.util.List;
+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;
+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) {
 
     @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) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         final GroupInviteLinkUrl linkUrl;
         final GroupInviteLinkUrl linkUrl;

-        String uri = ns.getString("uri");
+        var uri = ns.getString("uri");

         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {
         try {
             linkUrl = GroupInviteLinkUrl.fromUri(uri);
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException e) {

-            System.err.println("Group link is invalid: " + e.getMessage());
-            return 2;
+            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 2;
+            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 2;
+            throw new UserErrorException("Link is not a signal group invitation link");

         }
 
         try {
         }
 
         try {

-            final Pair<byte[], List<SendMessageResult>> results = m.joinGroup(linkUrl);
-            byte[] newGroupId = results.first();
-            if (!m.getGroup(newGroupId).isMember(m.getSelfAddress())) {
-                System.out.println("Requested to join group \"" + Base64.encodeBytes(newGroupId) + "\"");
+            final var results = m.joinGroup(linkUrl);
+            var newGroupId = results.first();
+            if (outputWriter instanceof JsonWriter writer) {
+                if (!m.getGroup(newGroupId).isMember()) {
+                    writer.write(Map.of("groupId", newGroupId.toBase64(), "onlyRequested", true));
+                } else {
+                    writer.write(Map.of("groupId", newGroupId.toBase64()));
+                }

             } else {
             } else {

-                System.out.println("Joined group \"" + Base64.encodeBytes(newGroupId) + "\"");
+                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());
+                }

             }
             }

-            return handleTimestampAndSendMessageResults(0, results.second());
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
+            handleSendMessageResults(results.second().getResults());

         } catch (GroupPatchNotAcceptedException e) {
         } catch (GroupPatchNotAcceptedException e) {

-            System.err.println("Failed to join group, maybe already a member");
-            return 1;
+            throw new UserErrorException("Failed to join group, maybe already a member");

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

-            e.printStackTrace();
-            handleIOException(e);
-            return 1;
-        } catch (Signal.Error.AttachmentInvalid e) {
-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            return 1;
+            throw new IOErrorException("Failed to send message: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);

         } catch (DBusExecutionException e) {
         } catch (DBusExecutionException e) {

-            System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")", e);

         } catch (GroupLinkNotActiveException e) {
         } catch (GroupLinkNotActiveException e) {

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

         }
     }
 }
         }
     }
 }