diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java index 40d9a730..c521b17e 100644 --- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java @@ -26,13 +26,9 @@ public class RemoteDeleteCommand implements DbusCommand { .required(true) .type(long.class) .help("Specify the timestamp of the message to delete."); - var mut = subparser.addMutuallyExclusiveGroup() - .required(true); - mut.addArgument("-g", "--group") - .required(false) + subparser.addArgument("-g", "--group") .help("Specify the recipient group ID."); - mut.addArgument("recipient") - .required(false) + subparser.addArgument("recipient") .help("Specify the recipients' phone number.").nargs("*"); } @@ -41,14 +37,10 @@ public class RemoteDeleteCommand implements DbusCommand { final List recipients = ns.getList("recipient"); final var groupIdString = ns.getString("group"); - // Possibly unnecessary (see above — recipient(s) or group is required), - // but just for case... final var noRecipients = recipients == null || recipients.isEmpty(); if (noRecipients && groupIdString == null) { throw new UserErrorException("No recipients given"); } - // Possibly unnecessary (see above — recipient(s) and group are mutually exclusive), - // but just for case... if (!noRecipients && groupIdString != null) { throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time"); }