X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/48b2c7ff8ad7b653c3a0cb42775a5850f593d0a0..af292d8f0ea897ea13470489d51c40acca50fc3e:/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 b392df05..397d1fe3 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -5,10 +5,9 @@ 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.GroupPermission; +import org.asamk.signal.JsonWriter; import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriterImpl; +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; @@ -16,7 +15,9 @@ 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.GroupLinkState; import org.asamk.signal.manager.groups.GroupNotFoundException; +import org.asamk.signal.manager.groups.GroupPermission; import org.asamk.signal.manager.groups.NotAGroupMemberException; import org.asamk.signal.util.ErrorUtils; import org.asamk.signal.util.Util; @@ -28,21 +29,22 @@ 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.HashMap; import java.util.List; -public class UpdateGroupCommand implements DbusCommand, LocalCommand { +public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand { private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class); - private final OutputWriter outputWriter; - public UpdateGroupCommand(final OutputWriter outputWriter) { - this.outputWriter = outputWriter; + @Override + public String getName() { + return "updateGroup"; } - public static void attachToSubparser(final Subparser subparser) { + @Override + public void attachToSubparser(final Subparser subparser) { subparser.help("Create or update a group."); - subparser.addArgument("-g", "--group").help("Specify the recipient group ID."); + 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"); @@ -60,23 +62,57 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { .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)); + .choices("enabled", "enabled-with-approval", "disabled"); subparser.addArgument("--set-permission-add-member") .help("Set permission to add new group members") - .type(Arguments.enumStringType(GroupPermission.class)); + .choices("every-member", "only-admins"); subparser.addArgument("--set-permission-edit-details") .help("Set permission to edit group details") - .type(Arguments.enumStringType(GroupPermission.class)); + .choices("every-member", "only-admins"); subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)"); } + GroupLinkState getGroupLinkState(String value) throws UserErrorException { + if (value == null) { + return null; + } + switch (value) { + case "enabled": + return GroupLinkState.ENABLED; + case "enabled-with-approval": + case "enabledWithApproval": + return GroupLinkState.ENABLED_WITH_APPROVAL; + case "disabled": + return GroupLinkState.DISABLED; + default: + throw new UserErrorException("Invalid group link state: " + value); + } + } + + GroupPermission getGroupPermission(String value) throws UserErrorException { + if (value == null) { + return null; + } + switch (value) { + case "every-member": + case "everyMember": + return GroupPermission.EVERY_MEMBER; + case "only-admins": + case "onlyAdmins": + return GroupPermission.ONLY_ADMINS; + default: + throw new UserErrorException("Invalid group permission: " + value); + } + } + @Override - public void handleCommand(final Namespace ns, final Manager m) throws CommandException { - final var writer = (PlainTextWriterImpl) outputWriter; + public void handleCommand( + final Namespace ns, final Manager m, final OutputWriter outputWriter + ) throws CommandException { GroupId groupId = null; - final var groupIdString = ns.getString("group"); + final var groupIdString = ns.getString("group-id"); if (groupIdString != null) { try { groupId = Util.decodeGroupId(groupIdString); @@ -93,19 +129,20 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { var groupRemoveAdmins = ns.getList("remove-admin"); var groupAvatar = ns.getString("avatar"); var groupResetLink = ns.getBoolean("reset-link"); - var groupLinkState = ns.get("link"); + var groupLinkState = getGroupLinkState(ns.getString("link")); var groupExpiration = ns.getInt("expiration"); - var groupAddMemberPermission = ns.get("set-permission-add-member"); - var groupEditDetailsPermission = ns.get("set-permission-edit-details"); + var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member")); + var groupEditDetailsPermission = getGroupPermission(ns.getString("set-permission-edit-details")); try { + boolean isNewGroup = false; if (groupId == null) { + isNewGroup = true; var results = m.createGroup(groupName, groupMembers, groupAvatar == null ? null : new File(groupAvatar)); - ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second()); + ErrorUtils.handleSendMessageResults(results.second()); groupId = results.first(); - writer.println("Created new group: \"{}\"", groupId.toBase64()); groupName = null; groupMembers = null; groupAvatar = null; @@ -119,14 +156,17 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { groupAdmins, groupRemoveAdmins, groupResetLink, - groupLinkState != null ? groupLinkState.toLinkState() : null, - groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null, - groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null, + groupLinkState, + groupAddMemberPermission, + groupEditDetailsPermission, groupAvatar == null ? null : new File(groupAvatar), groupExpiration); + Long timestamp = null; if (results != null) { - ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second()); + timestamp = results.first(); + ErrorUtils.handleSendMessageResults(results.second()); } + outputResult(outputWriter, timestamp, isNewGroup ? groupId : null); } catch (AttachmentInvalidException e) { throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); } catch (GroupNotFoundException e) { @@ -141,12 +181,13 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { } @Override - public void handleCommand(final Namespace ns, final Signal signal) throws CommandException { - final var writer = (PlainTextWriterImpl) outputWriter; + public void handleCommand( + final Namespace ns, final Signal signal, final OutputWriter outputWriter + ) throws CommandException { 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()); } @@ -173,7 +214,7 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { try { var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar); if (groupId.length != newGroupId.length) { - writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId)); + outputResult(outputWriter, null, GroupId.unknownVersion(newGroupId)); } } catch (Signal.Error.AttachmentInvalid e) { throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); @@ -181,4 +222,26 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand { throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); } } + + private void outputResult(final OutputWriter outputWriter, final Long timestamp, final GroupId groupId) { + if (outputWriter instanceof PlainTextWriter) { + final var writer = (PlainTextWriter) outputWriter; + if (groupId != null) { + writer.println("Created new group: \"{}\"", groupId.toBase64()); + } + if (timestamp != null) { + writer.println("{}", timestamp); + } + } else { + final var writer = (JsonWriter) outputWriter; + final var result = new HashMap<>(); + if (timestamp != null) { + result.put("timestamp", timestamp); + } + if (groupId != null) { + result.put("groupId", groupId.toBase64()); + } + writer.write(result); + } + } }