X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/382d8d22d0ccad109106b140616638799cc646f6..c3a9022bec11aa2c1333ce7ee1aae29b8212d760:/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 a7d29b17..1af21d53 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -4,9 +4,6 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-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;
@@ -17,6 +14,9 @@ import org.asamk.signal.manager.api.RecipientIdentifier;
 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.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.ErrorUtils;
 import org.asamk.signal.util.IOUtils;
@@ -28,6 +28,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -57,6 +58,14 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--mention")
                 .nargs("*")
                 .help("Mention another group member (syntax: start:length:recipientNumber)");
+        subparser.addArgument("--quote-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.");
+        subparser.addArgument("--quote-author").help("Specify the number of the author of the original message.");
+        subparser.addArgument("--quote-message").help("Specify the message of the original message.");
+        subparser.addArgument("--quote-mention")
+                .nargs("*")
+                .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
     }
 
     @Override
@@ -95,6 +104,7 @@ public class SendCommand implements JsonRpcLocalCommand {
 
         var messageText = ns.getString("message");
         if (messageText == null) {
+            logger.debug("Reading message from stdin...");
             try {
                 messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
             } catch (IOException e) {
@@ -108,26 +118,28 @@ public class SendCommand implements JsonRpcLocalCommand {
         }
 
         List<String> mentionStrings = ns.getList("mention");
-        List<Message.Mention> mentions;
-        if (mentionStrings == null) {
-            mentions = List.of();
+        final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
+
+        final Message.Quote quote;
+        final var quoteTimestamp = ns.getLong("quote-timestamp");
+        if (quoteTimestamp != null) {
+            final var quoteAuthor = ns.getString("quote-author");
+            final var quoteMessage = ns.getString("quote-message");
+            List<String> quoteMentionStrings = ns.getList("quote-mention");
+            final var quoteMentions = quoteMentionStrings == null
+                    ? List.<Message.Mention>of()
+                    : parseMentions(m, quoteMentionStrings);
+            quote = new Message.Quote(quoteTimestamp,
+                    CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
+                    quoteMessage,
+                    quoteMentions);
         } else {
-            final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)");
-            mentions = new ArrayList<>();
-            for (final var mention : mentionStrings) {
-                final var matcher = mentionPattern.matcher(mention);
-                if (!matcher.matches()) {
-                    throw new UserErrorException("Invalid mention syntax ("
-                            + mention
-                            + ") expected 'start:end:recipientNumber'");
-                }
-                mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
-                        m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
-            }
+            quote = null;
         }
 
         try {
-            var results = m.sendMessage(new Message(messageText, attachments, mentions), recipientIdentifiers);
+            var results = m.sendMessage(new Message(messageText, attachments, mentions, Optional.ofNullable(quote)),
+                    recipientIdentifiers);
             outputResult(outputWriter, results.timestamp());
             ErrorUtils.handleSendMessageResults(results.results());
         } catch (AttachmentInvalidException | IOException e) {
@@ -138,6 +150,25 @@ public class SendCommand implements JsonRpcLocalCommand {
         }
     }
 
+    private List<Message.Mention> parseMentions(
+            final Manager m, final List<String> mentionStrings
+    ) throws UserErrorException {
+        List<Message.Mention> mentions;
+        final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)");
+        mentions = new ArrayList<>();
+        for (final var mention : mentionStrings) {
+            final var matcher = mentionPattern.matcher(mention);
+            if (!matcher.matches()) {
+                throw new UserErrorException("Invalid mention syntax ("
+                        + mention
+                        + ") expected 'start:end:recipientNumber'");
+            }
+            mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
+                    m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
+        }
+        return mentions;
+    }
+
     private void outputResult(final OutputWriter outputWriter, final long timestamp) {
         if (outputWriter instanceof PlainTextWriter writer) {
             writer.println("{}", timestamp);