X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/357e278f48a6e1b3e3ab58f2ae34053ab1933b96..a91e3f762e0e5d6a9cf9e208fe85207d7829e22d:/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 00730c82..513ec2e4 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -8,17 +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.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.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.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; -public class UpdateGroupCommand implements DbusCommand { +public class UpdateGroupCommand implements DbusCommand, LocalCommand { private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class); @@ -26,8 +35,65 @@ 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."); + 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"); + } + + @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 groupMembers = ns.getList("member"); + + List groupRemoveMembers = ns.getList("remove-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, + groupRemoveMembers, + 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