Wrap ignoreAttachments option in a ReceiveConfig record

[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 f55858811078583042656ed4661379dc63de1dce..31fc4caf7ecc1018d7e8d4ed1b587f5783d16e8e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -3,24 +3,22 @@ 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.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.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.groups.GroupInviteLinkUrl;
 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.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 java.io.IOException;
 import java.util.Map;
 

-import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;
-

 public class JoinGroupCommand implements JsonRpcLocalCommand {
 
     @Override
 public class JoinGroupCommand implements JsonRpcLocalCommand {
 
     @Override


@@ -55,24 +53,36 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
         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));
+            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 {
                 } else {

-                    writer.write(Map.of("groupId", newGroupId.toBase64()));
+                    writer.write(Map.of("timestamp",
+                            results.second().timestamp(),
+                            "results",
+                            jsonResults,
+                            "groupId",
+                            newGroupId.toBase64()));

                 }
             } else {
                 final var writer = (PlainTextWriter) outputWriter;
                 }
             } else {
                 final var writer = (PlainTextWriter) outputWriter;

-                if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
+                if (!m.getGroup(newGroupId).isMember()) {

                     writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
                 } else {
                     writer.println("Joined group \"{}\"", newGroupId.toBase64());
                 }
                     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()
         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: "
                     + e.getMessage()


@@ -82,7 +92,7 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         } catch (DBusExecutionException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);
         } 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());
         }
     }
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
         }
     }