Add RecipientIdentifier as external Manager interface

[signal-cli] / src / main / java / org / asamk / signal / commands / SendCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index dbb02248a5907a75d82ca3aa370e66dce19cbc27..a1e4c2963d2cb3bbf195e9c7a4ccb4ac654354a3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -12,11 +12,15 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.manager.AttachmentInvalidException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.util.CommandUtil;
+import org.asamk.signal.util.ErrorUtils;
 import org.asamk.signal.util.IOUtils;
-import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.errors.UnknownObject;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
@@ -26,6 +30,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class SendCommand implements DbusCommand, JsonRpcLocalCommand {
 
@@ -40,9 +45,8 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Send a message to another user or group.");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
-        final var mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
-        mutuallyExclusiveGroup.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.");
-        mutuallyExclusiveGroup.addArgument("--note-to-self")
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+        subparser.addArgument("--note-to-self")
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
 
@@ -53,20 +57,77 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand {
                 .action(Arguments.storeTrue());
     }
 
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var isNoteToSelf = ns.getBoolean("note-to-self");
+        final var recipientStrings = ns.<String>getList("recipient");
+        final var groupIdStrings = ns.<String>getList("group-id");
+
+        final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
+                isNoteToSelf,
+                recipientStrings,
+                groupIdStrings);
+
+        final var isEndSession = ns.getBoolean("end-session");
+        if (isEndSession) {
+            final var singleRecipients = recipientIdentifiers.stream()
+                    .filter(r -> r instanceof RecipientIdentifier.Single)
+                    .map(RecipientIdentifier.Single.class::cast)
+                    .collect(Collectors.toSet());
+            if (singleRecipients.isEmpty()) {
+                throw new UserErrorException("No recipients given");
+            }
+
+            try {
+                m.sendEndSessionMessage(singleRecipients);
+                return;
+            } catch (IOException e) {
+                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+            }
+        }
+
+        var messageText = ns.getString("message");
+        if (messageText == null) {
+            try {
+                messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
+            } catch (IOException e) {
+                throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
+            }
+        }
+
+        List<String> attachments = ns.getList("attachment");
+        if (attachments == null) {
+            attachments = List.of();
+        }
+
+        try {
+            var results = m.sendMessage(new Message(messageText, attachments), recipientIdentifiers);
+            outputResult(outputWriter, results.getTimestamp());
+            ErrorUtils.handleSendMessageResults(results.getResults());
+        } catch (AttachmentInvalidException | IOException e) {
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            throw new UserErrorException(e.getMessage());
+        }
+    }
+
     @Override
     public void handleCommand(
             final Namespace ns, final Signal signal, final OutputWriter outputWriter
     ) throws CommandException {
-        final List<String> recipients = ns.getList("recipient");
+        final var recipients = ns.<String>getList("recipient");
         final var isEndSession = ns.getBoolean("end-session");
-        final var groupIdString = ns.getString("group-id");
+        final var groupIdStrings = ns.<String>getList("group-id");
         final var isNoteToSelf = ns.getBoolean("note-to-self");
 
         final var noRecipients = recipients == null || recipients.isEmpty();
-        if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) {
+        final var noGroups = groupIdStrings == null || groupIdStrings.isEmpty();
+        if ((noRecipients && isEndSession) || (noRecipients && noGroups && !isNoteToSelf)) {
             throw new UserErrorException("No recipients given");
         }
-        if (!noRecipients && groupIdString != null) {
+        if (!noRecipients && !noGroups) {
             throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
         }
         if (!noRecipients && isNoteToSelf) {
@@ -99,16 +160,14 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand {
             attachments = List.of();
         }
 
-        if (groupIdString != null) {
-            byte[] groupId;
-            try {
-                groupId = Util.decodeGroupId(groupIdString).serialize();
-            } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id: " + e.getMessage());
-            }
+        if (!noGroups) {
+            final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
 
             try {
-                var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
+                long timestamp = 0;
+                for (final var groupId : groupIds) {
+                    timestamp = signal.sendGroupMessage(messageText, attachments, groupId.serialize());
+                }
                 outputResult(outputWriter, timestamp);
                 return;
             } catch (DBusExecutionException e) {
@@ -149,11 +208,4 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand {
             writer.write(Map.of("timestamp", timestamp));
         }
     }
-
-    @Override
-    public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
-    ) throws CommandException {
-        handleCommand(ns, new DbusSignalImpl(m, null), outputWriter);
-    }
 }