Replace --group parameter with --group-id

[signal-cli] / src / main / java / org / asamk / signal / commands / RemoteDeleteCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 793b362a9521e7a13888307ae681bb1dd4d8019b..f1af3ae10a4c7366b263a466f4cd9e90c7aae9e2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -4,7 +4,8 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.OutputWriter;
+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;
@@ -17,21 +18,26 @@ import java.util.List;
 
 public class RemoteDeleteCommand implements DbusCommand {
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    private final OutputWriter outputWriter;
+
+    public RemoteDeleteCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
         subparser.help("Remotely delete a previously sent message.");
         subparser.addArgument("-t", "--target-timestamp")
                 .required(true)
                 .type(long.class)
                 .help("Specify the timestamp of the message to delete.");
-        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
         final List<String> recipients = ns.getList("recipient");
-        final var groupIdString = ns.getString("group");
+        final var groupIdString = ns.getString("group-id");
 
         final var noRecipients = recipients == null || recipients.isEmpty();
         if (noRecipients && groupIdString == null) {
@@ -41,9 +47,9 @@ public class RemoteDeleteCommand implements DbusCommand {
             throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
         }
 
-        final long targetTimestamp = ns.getLong("target_timestamp");
+        final long targetTimestamp = ns.getLong("target-timestamp");
 
-        final var writer = new PlainTextWriterImpl(System.out);
+        final var writer = (PlainTextWriter) outputWriter;
 
         byte[] groupId = null;
         if (groupIdString != null) {