X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..4ebacd0e1ff089ab961cbc557324801df46f33df:/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 8f601a68..00dd10d9 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -2,87 +2,133 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; + import org.asamk.Signal; -import org.asamk.signal.AttachmentInvalidException; -import org.asamk.signal.GroupIdFormatException; -import org.asamk.signal.GroupNotFoundException; -import org.asamk.signal.NotAGroupMemberException; +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.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions; -import org.whispersystems.signalservice.internal.util.Base64; +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; -import static org.asamk.signal.util.ErrorUtils.*; +public class UpdateGroupCommand implements DbusCommand, LocalCommand { -public class UpdateGroupCommand implements DbusCommand { + private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class); @Override 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("-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("-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"); } @Override - public int handleCommand(final Namespace ns, final Signal signal) { - if (!signal.isRegistered()) { - System.err.println("User is not registered."); - return 1; + 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"); + + var groupAvatar = ns.getString("avatar"); + try { - byte[] groupId = null; - if (ns.getString("group") != null) { - groupId = Util.decodeGroupId(ns.getString("group")); - } if (groupId == null) { - groupId = new byte[0]; - } - String groupName = ns.getString("name"); - if (groupName == null) { - groupName = ""; + 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, + groupAvatar == null ? null : new File(groupAvatar)); + ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second()); } - List groupMembers = ns.getList("member"); - if (groupMembers == null) { - groupMembers = new ArrayList<>(); - } - String groupAvatar = ns.getString("avatar"); - if (groupAvatar == null) { - groupAvatar = ""; - } - byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar); - if (groupId.length != newGroupId.length) { - System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …"); - } - return 0; - } catch (IOException e) { - handleIOException(e); - return 3; } catch (AttachmentInvalidException e) { - System.err.println("Failed to add avatar attachment for group\": " + e.getMessage()); - System.err.println("Aborting sending."); - return 1; + throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); } catch (GroupNotFoundException e) { - handleGroupNotFoundException(e); - return 1; + logger.warn("Unknown group id: {}", groupIdString); } catch (NotAGroupMemberException e) { - handleNotAGroupMemberException(e); - return 1; - } catch (EncapsulatedExceptions e) { - handleEncapsulatedExceptions(e); - return 3; - } catch (GroupIdFormatException e) { - handleGroupIdFormatException(e); - return 1; + 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 + public void handleCommand(final Namespace ns, final Signal signal) throws CommandException { + final var writer = new PlainTextWriterImpl(System.out); + byte[] groupId = null; + if (ns.getString("group") != null) { + try { + groupId = Util.decodeGroupId(ns.getString("group")).serialize(); + } catch (GroupIdFormatException e) { + throw new UserErrorException("Invalid group id:" + e.getMessage()); + } + } + if (groupId == null) { + groupId = new byte[0]; + } + + var groupName = ns.getString("name"); + if (groupName == null) { + groupName = ""; + } + + List groupMembers = ns.getList("member"); + if (groupMembers == null) { + groupMembers = new ArrayList<>(); + } + + var groupAvatar = ns.getString("avatar"); + if (groupAvatar == null) { + groupAvatar = ""; + } + + try { + var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar); + if (groupId.length != newGroupId.length) { + writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId)); + } + } catch (Signal.Error.AttachmentInvalid e) { + throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); + } catch (DBusExecutionException e) { + throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); } } }