Fix behavior for recipients with only UUIDs

[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 38560642f2f82ae68cca0d279d0ac7ea00546182..7e7488662d620d64918907138d91d28a4e6aed98 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,13 +4,13 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+import org.asamk.signal.manager.GroupNotFoundException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.NotAGroupMemberException;
+import org.asamk.signal.util.GroupIdFormatException;
 import org.asamk.signal.util.Util;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 
@@ -19,6 +19,7 @@ import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;
 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;
 
 public class SendReactionCommand implements LocalCommand {
@@ -61,7 +62,7 @@ public class SendReactionCommand implements LocalCommand {
 
         String emoji = ns.getString("emoji");
         boolean isRemove = ns.getBoolean("remove");
-        SignalServiceAddress targetAuthor = new SignalServiceAddress(null, ns.getString("target_author"));
+        String targetAuthor = ns.getString("target_author");
         long targetTimestamp = ns.getLong("target_timestamp");
 
         try {
@@ -69,7 +70,7 @@ public class SendReactionCommand implements LocalCommand {
                 byte[] groupId = Util.decodeGroupId(ns.getString("group"));
                 m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
-                m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.<String>getList("recipient"));
+                m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, ns.getList("recipient"));
             }
             return 0;
         } catch (IOException e) {
@@ -90,6 +91,9 @@ public class SendReactionCommand implements LocalCommand {
         } catch (GroupIdFormatException e) {
             handleGroupIdFormatException(e);
             return 1;
+        } catch (InvalidNumberException e) {
+            handleInvalidNumberException(e);
+            return 1;
         }
     }
 }