X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/3de30e166f4eb6be0cd10548ed2c6cce2fe2282e..a8bbdb54d006f157a009ece0cae5bf72fb636ced:/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 87307446..59e39394 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -1,10 +1,14 @@
 package org.asamk.signal.commands;
 
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.GroupLinkState;
+import org.asamk.signal.GroupPermission;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
@@ -30,10 +34,15 @@ import java.util.List;
 public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private final OutputWriter outputWriter;
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+    public UpdateGroupCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
+        subparser.help("Create or update a group.");
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the 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");
@@ -46,34 +55,48 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
                 .nargs("*")
                 .help("Specify one or more members to remove group admin privileges");
 
+        subparser.addArgument("--reset-link")
+                .action(Arguments.storeTrue())
+                .help("Reset group link and create new link password");
+        subparser.addArgument("--link")
+                .help("Set group link state, with or without admin approval")
+                .type(Arguments.enumStringType(GroupLinkState.class));
+
+        subparser.addArgument("--set-permission-add-member")
+                .help("Set permission to add new group members")
+                .type(Arguments.enumStringType(GroupPermission.class));
+        subparser.addArgument("--set-permission-edit-details")
+                .help("Set permission to edit group details")
+                .type(Arguments.enumStringType(GroupPermission.class));
+
+        subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
-        final var writer = new PlainTextWriterImpl(System.out);
+        final var writer = (PlainTextWriter) outputWriter;
         GroupId groupId = null;
-        final var groupIdString = ns.getString("group");
+        final var groupIdString = ns.getString("group-id");
         if (groupIdString != null) {
             try {
                 groupId = Util.decodeGroupId(groupIdString);
             } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id:" + e.getMessage());
+                throw new UserErrorException("Invalid group id: " + e.getMessage());
             }
         }
 
         var groupName = ns.getString("name");
-
         var groupDescription = ns.getString("description");
-
-        List<String> groupMembers = ns.getList("member");
-
-        List<String> groupRemoveMembers = ns.getList("remove-member");
-
-        List<String> groupAdmins = ns.getList("admin");
-
-        List<String> groupRemoveAdmins = ns.getList("remove-admin");
-
+        var groupMembers = ns.<String>getList("member");
+        var groupRemoveMembers = ns.<String>getList("remove-member");
+        var groupAdmins = ns.<String>getList("admin");
+        var groupRemoveAdmins = ns.<String>getList("remove-admin");
         var groupAvatar = ns.getString("avatar");
+        var groupResetLink = ns.getBoolean("reset-link");
+        var groupLinkState = ns.<GroupLinkState>get("link");
+        var groupExpiration = ns.getInt("expiration");
+        var groupAddMemberPermission = ns.<GroupPermission>get("set-permission-add-member");
+        var groupEditDetailsPermission = ns.<GroupPermission>get("set-permission-edit-details");
 
         try {
             if (groupId == null) {
@@ -81,17 +104,27 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
                         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,
-                        groupRemoveMembers,
-                        groupAdmins,
-                        groupRemoveAdmins,
-                        groupAvatar == null ? null : new File(groupAvatar));
+                groupId = results.first();
+                writer.println("Created new group: \"{}\"", groupId.toBase64());
+                groupName = null;
+                groupMembers = null;
+                groupAvatar = null;
+            }
+
+            var results = m.updateGroup(groupId,
+                    groupName,
+                    groupDescription,
+                    groupMembers,
+                    groupRemoveMembers,
+                    groupAdmins,
+                    groupRemoveAdmins,
+                    groupResetLink,
+                    groupLinkState != null ? groupLinkState.toLinkState() : null,
+                    groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
+                    groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
+                    groupAvatar == null ? null : new File(groupAvatar),
+                    groupExpiration);
+            if (results != null) {
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
             }
         } catch (AttachmentInvalidException e) {
@@ -109,13 +142,13 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
-        final var writer = new PlainTextWriterImpl(System.out);
+        final var writer = (PlainTextWriter) outputWriter;
         byte[] groupId = null;
-        if (ns.getString("group") != null) {
+        if (ns.getString("group-id") != null) {
             try {
-                groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+                groupId = Util.decodeGroupId(ns.getString("group-id")).serialize();
             } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id:" + e.getMessage());
+                throw new UserErrorException("Invalid group id: " + e.getMessage());
             }
         }
         if (groupId == null) {