dbus implementation of sendReaction command (#581)

[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 b9cbc0473adb2f2d8ed8391c774091c2fbf1b6f2..a80b6a23bc72fe1273eabca6f82b83c153242361 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,27 +4,21 @@ import net.sourceforge.argparse4j.impl.Arguments;
 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.commands.exceptions.CommandException;
-import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 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 static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults;
 
-public class SendReactionCommand implements LocalCommand {
+public class SendReactionCommand implements DbusCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
@@ -45,7 +39,7 @@ public class SendReactionCommand implements LocalCommand {
     }
 
     @Override
-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
         final List<String> recipients = ns.getList("recipient");
         final var groupIdString = ns.getString("group");
 
@@ -64,35 +58,34 @@ public class SendReactionCommand implements LocalCommand {
 
         final var writer = new PlainTextWriterImpl(System.out);
 
-        final Pair<Long, List<SendMessageResult>> results;
-
-        GroupId groupId = null;
-        if (groupId != null) {
+        byte[] groupId = null;
+        if (groupIdString != null) {
             try {
-                groupId = Util.decodeGroupId(groupIdString);
+                groupId = Util.decodeGroupId(groupIdString).serialize();
             } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id:" + e.getMessage());
+                throw new UserErrorException("Invalid group id: " + e.getMessage());
             }
         }
 
         try {
+            long timestamp;
             if (groupId != null) {
-                results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
+                timestamp = signal.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
-                results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
+                timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }
-            handleTimestampAndSendMessageResults(writer, results.first(), results.second());
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to send message: " + e.getMessage());
+            writer.println("{}", timestamp);
         } catch (AssertionError e) {
             handleAssertionError(e);
             throw e;
-        } catch (GroupNotFoundException e) {
-            throw new UserErrorException("Failed to send to group: " + e.getMessage());
-        } catch (NotAGroupMemberException e) {
-            throw new UserErrorException("Failed to send to group: " + e.getMessage());
-        } catch (InvalidNumberException e) {
+        } 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());
         }
     }
 }