Implement JsonRpc command for remoteDelete and sendReaction

diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index f1af3ae10a4c7366b263a466f4cd9e90c7aae9e2..37c55fe7c243a28b4623caa9452171acbba4d3fe 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -4,19 +4,23 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

+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.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 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 RemoteDeleteCommand implements DbusCommand {
+public class RemoteDeleteCommand implements DbusCommand, JsonRpcLocalCommand {

 
     private final OutputWriter outputWriter;
 
 
     private final OutputWriter outputWriter;
 


@@ -49,8 +53,6 @@ public class RemoteDeleteCommand implements DbusCommand {
 
         final long targetTimestamp = ns.getLong("target-timestamp");
 
 
         final long targetTimestamp = ns.getLong("target-timestamp");
 

-        final var writer = (PlainTextWriter) outputWriter;
-

         byte[] groupId = null;
         if (groupIdString != null) {
             try {
         byte[] groupId = null;
         if (groupIdString != null) {
             try {


@@ -67,7 +69,7 @@ public class RemoteDeleteCommand implements DbusCommand {
             } else {
                 timestamp = signal.sendRemoteDeleteMessage(targetTimestamp, recipients);
             }
             } else {
                 timestamp = signal.sendRemoteDeleteMessage(targetTimestamp, recipients);
             }

-            writer.println("{}", timestamp);
+            outputResult(timestamp);

         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.InvalidNumber e) {
         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.InvalidNumber e) {


@@ -78,4 +80,19 @@ public class RemoteDeleteCommand implements DbusCommand {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }

+
+    @Override
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        handleCommand(ns, new DbusSignalImpl(m, null));
+    }
+
+    private void outputResult(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));
+        }
+    }

 }
 }

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index f3385ce336257caf8d39aef7ef93953b752eb5af..44423749be999432acd7edf025ce01966d47e8d0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -5,19 +5,23 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

+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.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 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 {

 
     private final OutputWriter outputWriter;
 
 
     private final OutputWriter outputWriter;
 


@@ -60,8 +64,6 @@ public class SendReactionCommand implements DbusCommand {
         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 = (PlainTextWriter) outputWriter;
-

         byte[] groupId = null;
         if (groupIdString != null) {
             try {
         byte[] groupId = null;
         if (groupIdString != null) {
             try {


@@ -78,7 +80,7 @@ public class SendReactionCommand implements DbusCommand {
             } else {
                 timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }
             } else {
                 timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }

-            writer.println("{}", timestamp);
+            outputResult(timestamp);

         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.InvalidNumber e) {
         } catch (UnknownObject e) {
             throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
         } catch (Signal.Error.InvalidNumber e) {


@@ -89,4 +91,19 @@ public class SendReactionCommand implements DbusCommand {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }

+
+    @Override
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        handleCommand(ns, new DbusSignalImpl(m, null));
+    }
+
+    private void outputResult(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));
+        }
+    }

 }
 }