Split createGroup out of updateGroup method

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 204dcfe2af812e5afe06e0f3ba5fa94d018c7916..00dd10d98a91648f73129a22e551c88a5d2ddfa6 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -8,19 +8,26 @@ import org.asamk.signal.PlainTextWriterImpl;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;

+import org.asamk.signal.manager.AttachmentInvalidException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.groups.GroupId;

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupIdFormatException;

+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.util.ErrorUtils;

 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 

+import java.io.File;
+import java.io.IOException;

 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-
-public class UpdateGroupCommand implements DbusCommand {
+public class UpdateGroupCommand implements DbusCommand, LocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 


@@ -28,10 +35,61 @@ public class UpdateGroupCommand implements DbusCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
         subparser.addArgument("-n", "--name").help("Specify the new group name.");
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
         subparser.addArgument("-n", "--name").help("Specify the new group name.");

+        subparser.addArgument("-d", "--description").help("Specify the new group description.");

         subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");
         subparser.addArgument("-m", "--member").nargs("*").help("Specify one or more members to add to the group");
     }
 
         subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");
         subparser.addArgument("-m", "--member").nargs("*").help("Specify one or more members to add to the group");
     }
 

+    @Override
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        final var writer = new PlainTextWriterImpl(System.out);
+        GroupId groupId = null;
+        final var groupIdString = ns.getString("group");
+        if (groupIdString != null) {
+            try {
+                groupId = Util.decodeGroupId(groupIdString);
+            } catch (GroupIdFormatException e) {
+                throw new UserErrorException("Invalid group id:" + e.getMessage());
+            }
+        }
+
+        var groupName = ns.getString("name");
+
+        var groupDescription = ns.getString("description");
+
+        List<String> groupMembers = ns.getList("member");
+
+        var groupAvatar = ns.getString("avatar");
+
+        try {
+            if (groupId == null) {
+                var results = m.createGroup(groupName,
+                        groupMembers,
+                        groupAvatar == null ? null : new File(groupAvatar));
+                ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
+                final var newGroupId = results.first();
+                writer.println("Created new group: \"{}\"", newGroupId.toBase64());
+            } else {
+                var results = m.updateGroup(groupId,
+                        groupName,
+                        groupDescription,
+                        groupMembers,
+                        groupAvatar == null ? null : new File(groupAvatar));
+                ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+            }
+        } catch (AttachmentInvalidException e) {
+            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
+        } catch (GroupNotFoundException e) {
+            logger.warn("Unknown group id: {}", groupIdString);
+        } catch (NotAGroupMemberException e) {
+            logger.warn("You're not a group member");
+        } catch (InvalidNumberException e) {
+            throw new UserErrorException("Failed to parse member number: " + e.getMessage());
+        } catch (IOException e) {
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+        }
+    }
+

     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
         final var writer = new PlainTextWriterImpl(System.out);
     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
         final var writer = new PlainTextWriterImpl(System.out);


@@ -67,9 +125,6 @@ public class UpdateGroupCommand implements DbusCommand {
             if (groupId.length != newGroupId.length) {
                 writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId));
             }
             if (groupId.length != newGroupId.length) {
                 writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId));
             }

-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            throw e;

         } catch (Signal.Error.AttachmentInvalid e) {
             throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
         } catch (DBusExecutionException e) {
         } catch (Signal.Error.AttachmentInvalid e) {
             throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
         } catch (DBusExecutionException e) {