Split given/family name in updateContact command

[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..ae324c84c89dfb11e94840df486aa632515c0cdb 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;


@@ -120,7 +119,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 +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);


@@ -205,7 +204,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 ("