X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4ebacd0e1ff089ab961cbc557324801df46f33df..7170a68571f2d612f908e5293c15850ba726f35d:/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 00dd10d9..5a660650 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -1,9 +1,11 @@ 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.GroupLinkState; import org.asamk.signal.PlainTextWriterImpl; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; @@ -38,6 +40,22 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { 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("-r", "--remove-member") + .nargs("*") + .help("Specify one or more members to remove from the group"); + subparser.addArgument("--admin").nargs("*").help("Specify one or more members to make a group admin"); + subparser.addArgument("--remove-admin") + .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("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)"); } @Override @@ -57,10 +75,22 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { var groupDescription = ns.getString("description"); - List groupMembers = ns.getList("member"); + var groupMembers = ns.getList("member"); + + var groupRemoveMembers = ns.getList("remove-member"); + + var groupAdmins = ns.getList("admin"); + + var groupRemoveAdmins = ns.getList("remove-admin"); var groupAvatar = ns.getString("avatar"); + var groupResetLink = ns.getBoolean("reset-link"); + + var groupLinkState = ns.get("link"); + + var groupExpiration = ns.getInt("expiration"); + try { if (groupId == null) { var results = m.createGroup(groupName, @@ -74,7 +104,13 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { groupName, groupDescription, groupMembers, - groupAvatar == null ? null : new File(groupAvatar)); + groupRemoveMembers, + groupAdmins, + groupRemoveAdmins, + groupResetLink, + groupLinkState != null ? groupLinkState.toLinkState() : null, + groupAvatar == null ? null : new File(groupAvatar), + groupExpiration); ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second()); } } catch (AttachmentInvalidException e) {