Fix JsonRpcLocalCommand interface

[signal-cli] / 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 3d000a621acbe14ea6e843a31fb504c75bf537cc..44423749be999432acd7edf025ce01966d47e8d0 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,36 +4,35 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.signal.manager.GroupNotFoundException;
+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.dbus.DbusSignalImpl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.util.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.asamk.signal.util.Util;

-import org.whispersystems.libsignal.util.Pair;
-import org.whispersystems.signalservice.api.messages.SendMessageResult;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.freedesktop.dbus.errors.UnknownObject;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;

 
 

-import java.io.IOException;

 import java.util.List;
 import java.util.List;

+import java.util.Map;

 
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
-import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
-import static org.asamk.signal.util.ErrorUtils.handleIOException;
-import static org.asamk.signal.util.ErrorUtils.handleInvalidNumberException;
-import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;
-import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
+public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {

 
 

-public class SendReactionCommand implements LocalCommand {
+    private final OutputWriter outputWriter;

 
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    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.help("Send reaction to a previously received or sent message.");

-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("recipient")
-                .help("Specify the recipients' phone number.")
-                .nargs("*");
+        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)
                 .help("Specify the emoji, should be a single unicode grapheme cluster.");
         subparser.addArgument("-e", "--emoji")
                 .required(true)
                 .help("Specify the emoji, should be a single unicode grapheme cluster.");


@@ -44,57 +43,67 @@ public class SendReactionCommand implements LocalCommand {
                 .required(true)
                 .type(long.class)
                 .help("Specify the timestamp of the message to which to react.");
                 .required(true)
                 .type(long.class)
                 .help("Specify the timestamp of the message to which to react.");

-        subparser.addArgument("-r", "--remove")
-                .help("Remove a reaction.")
-                .action(Arguments.storeTrue());
+        subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
+        final List<String> recipients = ns.getList("recipient");
+        final var groupIdString = ns.getString("group-id");

 
 

-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ns.getString("group") == null) {
-            System.err.println("No recipients given");
-            System.err.println("Aborting sending.");
-            return 1;
+        final var noRecipients = recipients == null || recipients.isEmpty();
+        if (noRecipients && groupIdString == null) {
+            throw new UserErrorException("No recipients given");

         }
         }

+        if (!noRecipients && groupIdString != null) {
+            throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
+        }
+
+        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");

 
 

-        String emoji = ns.getString("emoji");
-        boolean isRemove = ns.getBoolean("remove");
-        String targetAuthor = ns.getString("target_author");
-        long targetTimestamp = ns.getLong("target_timestamp");
+        byte[] groupId = null;
+        if (groupIdString != null) {
+            try {
+                groupId = Util.decodeGroupId(groupIdString).serialize();
+            } catch (GroupIdFormatException e) {
+                throw new UserErrorException("Invalid group id: " + e.getMessage());
+            }
+        }

 
         try {
 
         try {

-            final Pair<Long, List<SendMessageResult>> results;
-            if (ns.getString("group") != null) {
-                byte[] groupId = Util.decodeGroupId(ns.getString("group"));
-                results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
+            long timestamp;
+            if (groupId != null) {
+                timestamp = signal.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);

             } else {
             } else {

-                results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.getList("recipient"));
+                timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);

             }
             }

-            handleTimestampAndSendMessageResults(results.first(), results.second());
-            return 0;
-        } catch (IOException e) {
-            handleIOException(e);
-            return 3;
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
-        } catch (GroupNotFoundException e) {
-            handleGroupNotFoundException(e);
-            return 1;
-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
-            return 1;
-        } catch (InvalidNumberException e) {
-            handleInvalidNumberException(e);
-            return 1;
+            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) {
+            throw new UserErrorException("Invalid number: " + e.getMessage());
+        } catch (Signal.Error.GroupNotFound e) {
+            throw new UserErrorException("Failed to send to group: " + e.getMessage());
+        } catch (DBusExecutionException e) {
+            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));

         }
     }
 }
         }
     }
 }