Add UnregisteredRecipientException

[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 11a16b2e8a3c0aa04c43704faecad09c3fdd45ab..f5b6a89dabbc28a2418b815d380974b883038f84 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,26 +4,22 @@ 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.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.manager.Manager;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.ErrorUtils;
-import org.freedesktop.dbus.errors.UnknownObject;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
-import java.util.Map;
 
-public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {
+import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
+
+public class SendReactionCommand implements JsonRpcLocalCommand {
 
     @Override
     public String getName() {
@@ -55,7 +51,7 @@ public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        final var isNoteToSelf = ns.getBoolean("note-to-self");
+        final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
 
@@ -65,81 +61,24 @@ public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {
                 groupIdStrings);
 
         final var emoji = ns.getString("emoji");
-        final var isRemove = ns.getBoolean("remove");
+        final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
         final var targetAuthor = ns.getString("target-author");
         final var targetTimestamp = ns.getLong("target-timestamp");
 
         try {
             final var results = m.sendMessageReaction(emoji,
                     isRemove,
-                    CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getUsername()),
+                    CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetTimestamp,
                     recipientIdentifiers);
-            outputResult(outputWriter, results.getTimestamp());
-            ErrorUtils.handleSendMessageResults(results.getResults());
+            outputResult(outputWriter, results);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
         } catch (IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")");
-        }
-    }
-
-    @Override
-    public void handleCommand(
-            final Namespace ns, final Signal signal, final OutputWriter outputWriter
-    ) throws CommandException {
-        final var recipients = ns.<String>getList("recipient");
-        final var groupIdStrings = ns.<String>getList("group-id");
-
-        final var noRecipients = recipients == null || recipients.isEmpty();
-        final var noGroups = groupIdStrings == null || groupIdStrings.isEmpty();
-        if (noRecipients && noGroups) {
-            throw new UserErrorException("No recipients given");
-        }
-        if (!noRecipients && !noGroups) {
-            throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
-        }
-
-        final var emoji = ns.getString("emoji");
-        final var isRemove = ns.getBoolean("remove");
-        final var targetAuthor = ns.getString("target-author");
-        final var targetTimestamp = ns.getLong("target-timestamp");
-
-        try {
-            long timestamp = 0;
-            if (!noGroups) {
-                final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
-                for (final var groupId : groupIds) {
-                    timestamp = signal.sendGroupMessageReaction(emoji,
-                            isRemove,
-                            targetAuthor,
-                            targetTimestamp,
-                            groupId.serialize());
-                }
-            } else {
-                timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
-            }
-            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) {
-            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() + " (" + e.getClass()
-                    .getSimpleName() + ")");
-        }
-    }
-
-    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));
+                    .getSimpleName() + ")", e);
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
         }
     }
 }