X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/357e278f48a6e1b3e3ab58f2ae34053ab1933b96..b09677a46c4ecf07f305892b51a927e4d7341793:/src/main/java/org/asamk/signal/commands/SendReactionCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index f610e81b..f3385ce3 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -5,7 +5,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; @@ -18,10 +19,15 @@ import java.util.List; public class SendReactionCommand implements DbusCommand { - @Override - public void attachToSubparser(final Subparser subparser) { + private final OutputWriter outputWriter; + + public SendReactionCommand(final OutputWriter outputWriter) { + this.outputWriter = outputWriter; + } + + public static void attachToSubparser(final Subparser subparser) { subparser.help("Send reaction to a previously received or sent message."); - 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("*"); subparser.addArgument("-e", "--emoji") .required(true) @@ -39,7 +45,7 @@ public class SendReactionCommand implements DbusCommand { @Override public void handleCommand(final Namespace ns, final Signal signal) throws CommandException { final List 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) { @@ -51,10 +57,10 @@ public class SendReactionCommand implements DbusCommand { final var emoji = ns.getString("emoji"); final boolean isRemove = ns.getBoolean("remove"); - final var targetAuthor = ns.getString("target_author"); - final long targetTimestamp = ns.getLong("target_timestamp"); + final var targetAuthor = ns.getString("target-author"); + 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) {