Added base64 encoded attachment support (#966)

[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 4ad75e956dd322dfc405c4fbc0ebc16fc82c4c81..411895dd29f19062f10db70fa9c14e720a6de6c1 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -24,7 +24,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 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;


@@ -56,7 +55,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         mut.addArgument("--message-from-stdin")
                 .action(Arguments.storeTrue())
                 .help("Read the message from standard input.");
         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("-a", "--attachment").nargs("*").help("Add an attachment. "
+                + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. "
+                + "data:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>.");

         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());


@@ -120,7 +121,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         if (readMessageFromStdin || (messageText == null && sticker == null)) {
             logger.debug("Reading message from stdin...");
             try {
         if (readMessageFromStdin || (messageText == null && sticker == null)) {
             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());
             }


@@ -189,7 +190,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);


@@ -205,7 +206,7 @@ public class SendCommand implements JsonRpcLocalCommand {
     }
 
     private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {
     }
 
     private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {

-        final Pattern stickerPattern = Pattern.compile("([0-9a-f]+):([0-9]+)");
+        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 ("
         final var matcher = stickerPattern.matcher(stickerString);
         if (!matcher.matches() || matcher.group(1).length() % 2 != 0) {
             throw new UserErrorException("Invalid sticker syntax ("