X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/06e93b84da2718c31111e820cd35a3354f22bae2..c0aa338d7c8e40874dbc453b3fc3916701762029:/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 f4f2db0b..f29f0732 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -7,16 +7,17 @@ import net.sourceforge.argparse4j.inf.Subparser; 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.api.AttachmentInvalidException; +import org.asamk.signal.manager.api.GroupId; +import org.asamk.signal.manager.api.GroupLinkState; +import org.asamk.signal.manager.api.GroupNotFoundException; +import org.asamk.signal.manager.api.GroupPermission; +import org.asamk.signal.manager.api.GroupSendingNotAllowedException; +import org.asamk.signal.manager.api.NotAGroupMemberException; import org.asamk.signal.manager.api.SendGroupMessageResults; +import org.asamk.signal.manager.api.UnregisteredRecipientException; import org.asamk.signal.manager.api.UpdateGroup; -import org.asamk.signal.manager.groups.GroupId; -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.GroupSendingNotAllowedException; -import org.asamk.signal.manager.groups.NotAGroupMemberException; import org.asamk.signal.output.JsonWriter; import org.asamk.signal.output.OutputWriter; import org.asamk.signal.output.PlainTextWriter; @@ -25,15 +26,13 @@ import org.asamk.signal.util.SendMessageResultUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.File; import java.io.IOException; import java.util.HashMap; -import java.util.stream.Collectors; import java.util.stream.Stream; public class UpdateGroupCommand implements JsonRpcLocalCommand { - private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class); + private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class); @Override public String getName() { @@ -55,6 +54,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { subparser.addArgument("--remove-admin") .nargs("*") .help("Specify one or more members to remove group admin privileges"); + subparser.addArgument("--ban").nargs("*").help("Specify one or more members to ban from joining the group"); + subparser.addArgument("--unban").nargs("*").help("Specify one or more members to remove from the ban list"); subparser.addArgument("--reset-link") .action(Arguments.storeTrue()) @@ -114,6 +115,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { var groupRemoveMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-member"), localNumber); var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber); var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber); + var groupBan = CommandUtil.getSingleRecipientIdentifiers(ns.getList("ban"), localNumber); + var groupUnban = CommandUtil.getSingleRecipientIdentifiers(ns.getList("unban"), localNumber); var groupAvatar = ns.getString("avatar"); var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link")); var groupLinkState = getGroupLinkState(ns.getString("link")); @@ -127,9 +130,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { SendGroupMessageResults groupMessageResults = null; if (groupId == null) { isNewGroup = true; - var results = m.createGroup(groupName, - groupMembers, - groupAvatar == null ? null : new File(groupAvatar)); + var results = m.createGroup(groupName, groupMembers, groupAvatar); groupMessageResults = results.second(); groupId = results.first(); groupName = null; @@ -145,11 +146,13 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { .withRemoveMembers(groupRemoveMembers) .withAdmins(groupAdmins) .withRemoveAdmins(groupRemoveAdmins) + .withBanMembers(groupBan) + .withUnbanMembers(groupUnban) .withResetGroupLink(groupResetLink) .withGroupLinkState(groupLinkState) .withAddMemberPermission(groupAddMemberPermission) .withEditDetailsPermission(groupEditDetailsPermission) - .withAvatarFile(groupAvatar == null ? null : new File(groupAvatar)) + .withAvatarFile(groupAvatar) .withExpirationTimer(groupExpiration) .withIsAnnouncementGroup(groupSendMessagesPermission == null ? null @@ -160,8 +163,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { groupMessageResults = results; } else { groupMessageResults = new SendGroupMessageResults(results.timestamp(), - Stream.concat(groupMessageResults.results().stream(), results.results().stream()) - .collect(Collectors.toList())); + Stream.concat(groupMessageResults.results().stream(), results.results().stream()).toList()); } } outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null); @@ -169,6 +171,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) { throw new UserErrorException(e.getMessage()); + } catch (UnregisteredRecipientException e) { + throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered."); } catch (IOException e) { throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() .getSimpleName() + ")", e); @@ -178,27 +182,29 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { private void outputResult( final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId ) { - if (outputWriter instanceof PlainTextWriter writer) { - if (groupId != null) { - writer.println("Created new group: \"{}\"", groupId.toBase64()); - } - if (results != null) { - var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results()); - SendMessageResultUtils.printSendMessageResultErrors(writer, errors); - writer.println("{}", results.timestamp()); - } - } else { - final var writer = (JsonWriter) outputWriter; - final var response = new HashMap<>(); - if (results != null) { - response.put("timestamp", results.timestamp()); - var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results()); - response.put("results", jsonResults); + switch (outputWriter) { + case PlainTextWriter writer -> { + if (groupId != null) { + writer.println("Created new group: \"{}\"", groupId.toBase64()); + } + if (results != null) { + var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results()); + SendMessageResultUtils.printSendMessageResultErrors(writer, errors); + writer.println("{}", results.timestamp()); + } } - if (groupId != null) { - response.put("groupId", groupId.toBase64()); + case JsonWriter writer -> { + final var response = new HashMap<>(); + if (results != null) { + response.put("timestamp", results.timestamp()); + var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results()); + response.put("results", jsonResults); + } + if (groupId != null) { + response.put("groupId", groupId.toBase64()); + } + writer.write(response); } - writer.write(response); } } }