X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/357e278f48a6e1b3e3ab58f2ae34053ab1933b96..a18d6b3fe47fb5ea2e42d048eb1cc9eef41e6694:/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..fedded42 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -5,23 +5,33 @@ 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.JsonWriter;
+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;
+import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.errors.UnknownObject;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.util.List;
+import java.util.Map;
 
-public class SendReactionCommand implements DbusCommand {
+public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "sendReaction";
+    }
 
     @Override
     public 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)
@@ -37,9 +47,11 @@ public class SendReactionCommand implements DbusCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Signal signal, final OutputWriter outputWriter
+    ) 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) {
@@ -51,10 +63,8 @@ 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 writer = new PlainTextWriterImpl(System.out);
+        final var targetAuthor = ns.getString("target-author");
+        final long targetTimestamp = ns.getLong("target-timestamp");
 
         byte[] groupId = null;
         if (groupIdString != null) {
@@ -72,7 +82,7 @@ public class SendReactionCommand implements DbusCommand {
             } else {
                 timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }
-            writer.println("{}", timestamp);
+            outputResult(outputWriter, timestamp);
         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.InvalidNumber e) {
@@ -83,4 +93,21 @@ public class SendReactionCommand implements DbusCommand {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        handleCommand(ns, new DbusSignalImpl(m, null), outputWriter);
+    }
+
+    private void outputResult(final OutputWriter outputWriter, final long timestamp) {
+        if (outputWriter instanceof PlainTextWriter) {
+            final var writer = (PlainTextWriter) outputWriter;
+            writer.println("{}", timestamp);
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            writer.write(Map.of("timestamp", timestamp));
+        }
+    }
 }