Implement editing of previous messages

[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 23a7fb37667eb42b760a08eebc9f2b265f9330d3..9534f182a2ccbc4a4865dd63ffbad090048170d9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -80,6 +80,13 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--preview-title").help("Specify the title for the link preview (mandatory).");
         subparser.addArgument("--preview-description").help("Specify the description for the link preview (optional).");
         subparser.addArgument("--preview-image").help("Specify the image file for the link preview (optional).");
+        subparser.addArgument("--story-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a story to reply to.");
+        subparser.addArgument("--story-author").help("Specify the number of the author of the story.");
+        subparser.addArgument("--edit-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a previous message with the recipient or group to send an edited message.");
     }
 
     @Override
@@ -120,13 +127,15 @@ public class SendCommand implements JsonRpcLocalCommand {
 
         var messageText = ns.getString("message");
         final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE;
-        if (readMessageFromStdin || (messageText == null && sticker == null)) {
+        if (readMessageFromStdin) {
             logger.debug("Reading message from stdin...");
             try {
                 messageText = IOUtils.readAll(System.in, IOUtils.getConsoleCharset());
             } catch (IOException e) {
                 throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
             }
+        } else if (messageText == null) {
+            messageText = "";
         }
 
         List<String> attachments = ns.getList("attachment");
@@ -168,13 +177,34 @@ public class SendCommand implements JsonRpcLocalCommand {
             previews = List.of();
         }
 
+        final Message.StoryReply storyReply;
+        final var storyReplyTimestamp = ns.getLong("story-timestamp");
+        if (storyReplyTimestamp != null) {
+            final var storyAuthor = ns.getString("story-author");
+            storyReply = new Message.StoryReply(storyReplyTimestamp,
+                    CommandUtil.getSingleRecipientIdentifier(storyAuthor, m.getSelfNumber()));
+        } else {
+            storyReply = null;
+        }
+
+        if (messageText.isEmpty() && attachments.isEmpty() && sticker == null && quote == null) {
+            throw new UserErrorException(
+                    "Sending empty message is not allowed, either a message, attachment or sticker must be given.");
+        }
+
+        final var editTimestamp = ns.getLong("edit-timestamp");
+
         try {
-            var results = m.sendMessage(new Message(messageText == null ? "" : messageText,
+            final var message = new Message(messageText,
                     attachments,
                     mentions,
                     Optional.ofNullable(quote),
                     Optional.ofNullable(sticker),
-                    previews), recipientIdentifiers);
+                    previews,
+                    Optional.ofNullable((storyReply)));
+            var results = editTimestamp != null
+                    ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
+                    : m.sendMessage(message, recipientIdentifiers);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()