X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e3752e733adaad6f04c7d525e1b465a4b46474c7..d783df510a58b1dbed973cbc193a57b7ad700f68:/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
index 74f48112..5dd29682 100644
--- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
@@ -7,8 +7,8 @@ import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.asamk.signal.manager.UntrustedIdentityException;
+import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 
@@ -27,20 +27,23 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
                 .type(long.class)
                 .nargs("+")
                 .help("Specify the timestamp of the messages for which a receipt should be sent.");
-        subparser.addArgument("--type").help("Specify the receipt type.").choices("read", "viewed").setDefault("read");
+        subparser.addArgument("--type")
+                .help("Specify the receipt type (default is read receipt).")
+                .choices("read", "viewed");
     }
 
     @Override
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        final var recipient = ns.getString("recipient");
+        final var recipientString = ns.getString("recipient");
+        final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
 
         final var targetTimestamps = ns.<Long>getList("target-timestamp");
         final var type = ns.getString("type");
 
         try {
-            if ("read".equals(type)) {
+            if (type == null || "read".equals(type)) {
                 m.sendReadReceipt(recipient, targetTimestamps);
             } else if ("viewed".equals(type)) {
                 m.sendViewedReceipt(recipient, targetTimestamps);
@@ -48,9 +51,8 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
                 throw new UserErrorException("Unknown receipt type: " + type);
             }
         } catch (IOException | UntrustedIdentityException e) {
-            throw new UserErrorException("Failed to send message: " + e.getMessage());
-        } catch (InvalidNumberException e) {
-            throw new UserErrorException("Invalid number: " + e.getMessage());
+            throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")");
         }
     }
 }