X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/7170a68571f2d612f908e5293c15850ba726f35d..78f22c70205bdda075f5db6cd5b77ce0f0f79525:/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 5a660650..6f7f87fd 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -6,6 +6,7 @@ import net.sourceforge.argparse4j.inf.Subparser; import org.asamk.Signal; import org.asamk.signal.GroupLinkState; +import org.asamk.signal.GroupPermission; import org.asamk.signal.PlainTextWriterImpl; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; @@ -55,6 +56,13 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { .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)"); } @@ -67,29 +75,22 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { 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"); - 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"); + var groupAddMemberPermission = ns.get("set-permission-add-member"); + var groupEditDetailsPermission = ns.get("set-permission-edit-details"); try { if (groupId == null) { @@ -109,6 +110,8 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { groupRemoveAdmins, groupResetLink, groupLinkState != null ? groupLinkState.toLinkState() : null, + groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null, + groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null, groupAvatar == null ? null : new File(groupAvatar), groupExpiration); ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second()); @@ -134,7 +137,7 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { try { groupId = Util.decodeGroupId(ns.getString("group")).serialize(); } catch (GroupIdFormatException e) { - throw new UserErrorException("Invalid group id:" + e.getMessage()); + throw new UserErrorException("Invalid group id: " + e.getMessage()); } } if (groupId == null) {