Use console charset for reading/writing to stdin/out

[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 08f2d9a33b6f104125d8aab29d0cb94ad3bfcd69..ae324c84c89dfb11e94840df486aa632515c0cdb 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -7,21 +7,23 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;

-import org.asamk.signal.manager.AttachmentInvalidException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.InvalidStickerException;

 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.RecipientIdentifier;

+import org.asamk.signal.manager.api.UnregisteredRecipientException;

 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.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 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.OutputWriter;
 import org.asamk.signal.util.CommandUtil;

+import org.asamk.signal.util.Hex;

 import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;

-import java.nio.charset.Charset;

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;


@@ -48,7 +50,11 @@ public class SendCommand implements JsonRpcLocalCommand {
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
 
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
 

-        subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used.");
+        var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("-m", "--message").help("Specify the message to be sent.");
+        mut.addArgument("--message-from-stdin")
+                .action(Arguments.storeTrue())
+                .help("Read the message from standard input.");

         subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
         subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")


@@ -64,6 +70,12 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--quote-mention")
                 .nargs("*")
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
         subparser.addArgument("--quote-mention")
                 .nargs("*")
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");

+        subparser.addArgument("--sticker").help("Send a sticker (syntax: stickerPackId:stickerId)");
+        subparser.addArgument("--preview-url")
+                .help("Specify the url for the link preview (the same url must also appear in the message body).");
+        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).");

     }
 
     @Override
     }
 
     @Override


@@ -99,11 +111,15 @@ public class SendCommand implements JsonRpcLocalCommand {
             }
         }
 
             }
         }
 

+        final var stickerString = ns.getString("sticker");
+        final var sticker = stickerString == null ? null : parseSticker(stickerString);
+

         var messageText = ns.getString("message");
         var messageText = ns.getString("message");

-        if (messageText == null) {
+        final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE;
+        if (readMessageFromStdin || (messageText == null && sticker == null)) {

             logger.debug("Reading message from stdin...");
             try {
             logger.debug("Reading message from stdin...");
             try {

-                messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
+                messageText = IOUtils.readAll(System.in, IOUtils.getConsoleCharset());

             } catch (IOException e) {
                 throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
             }
             } catch (IOException e) {
                 throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
             }


@@ -128,21 +144,43 @@ public class SendCommand implements JsonRpcLocalCommand {
                     : parseMentions(m, quoteMentionStrings);
             quote = new Message.Quote(quoteTimestamp,
                     CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
                     : parseMentions(m, quoteMentionStrings);
             quote = new Message.Quote(quoteTimestamp,
                     CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),

-                    quoteMessage,
+                    quoteMessage == null ? "" : quoteMessage,

                     quoteMentions);
         } else {
             quote = null;
         }
 
                     quoteMentions);
         } else {
             quote = null;
         }
 

+        final List<Message.Preview> previews;
+        String previewUrl = ns.getString("preview-url");
+        if (previewUrl != null) {
+            String previewTitle = ns.getString("preview-title");
+            String previewDescription = ns.getString("preview-description");
+            String previewImage = ns.getString("preview-image");
+            previews = List.of(new Message.Preview(previewUrl,
+                    Optional.ofNullable(previewTitle).orElse(""),
+                    Optional.ofNullable(previewDescription).orElse(""),
+                    Optional.ofNullable(previewImage)));
+        } else {
+            previews = List.of();
+        }
+

         try {
         try {

-            var results = m.sendMessage(new Message(messageText, attachments, mentions, Optional.ofNullable(quote)),
-                    recipientIdentifiers);
+            var results = m.sendMessage(new Message(messageText == null ? "" : messageText,
+                    attachments,
+                    mentions,
+                    Optional.ofNullable(quote),
+                    Optional.ofNullable(sticker),
+                    previews), recipientIdentifiers);

             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")", e);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());

+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+        } catch (InvalidStickerException e) {
+            throw new UserErrorException("Failed to send sticker: " + e.getMessage(), e);

         }
     }
 
         }
     }
 


@@ -150,7 +188,7 @@ public class SendCommand implements JsonRpcLocalCommand {
             final Manager m, final List<String> mentionStrings
     ) throws UserErrorException {
         List<Message.Mention> mentions;
             final Manager m, final List<String> mentionStrings
     ) throws UserErrorException {
         List<Message.Mention> mentions;

-        final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)");
+        final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");

         mentions = new ArrayList<>();
         for (final var mention : mentionStrings) {
             final var matcher = mentionPattern.matcher(mention);
         mentions = new ArrayList<>();
         for (final var mention : mentionStrings) {
             final var matcher = mentionPattern.matcher(mention);


@@ -164,4 +202,15 @@ public class SendCommand implements JsonRpcLocalCommand {
         }
         return mentions;
     }
         }
         return mentions;
     }

+
+    private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {
+        final Pattern stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
+        final var matcher = stickerPattern.matcher(stickerString);
+        if (!matcher.matches() || matcher.group(1).length() % 2 != 0) {
+            throw new UserErrorException("Invalid sticker syntax ("
+                    + stickerString
+                    + ") expected 'stickerPackId:stickerId'");
+        }
+        return new Message.Sticker(Hex.toByteArray(matcher.group(1)), Integer.parseInt(matcher.group(2)));
+    }

 }
 }