X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/404063a080a1a8784a1111304cc6b90b58362923..e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2:/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 74209feb..56a26253 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -7,15 +7,16 @@ 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.manager.AttachmentInvalidException; import org.asamk.signal.manager.Manager; +import org.asamk.signal.manager.api.AttachmentInvalidException; +import org.asamk.signal.manager.api.GroupNotFoundException; +import org.asamk.signal.manager.api.GroupSendingNotAllowedException; import org.asamk.signal.manager.api.InvalidStickerException; import org.asamk.signal.manager.api.Message; +import org.asamk.signal.manager.api.NotAGroupMemberException; import org.asamk.signal.manager.api.RecipientIdentifier; +import org.asamk.signal.manager.api.TextStyle; 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.util.Hex; @@ -24,7 +25,6 @@ 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; @@ -51,14 +51,25 @@ public class SendCommand implements JsonRpcLocalCommand { .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."); - subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment"); + 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 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:;filename=;base64,."); subparser.addArgument("-e", "--end-session", "--endsession") .help("Clear session state and send end session message.") .action(Arguments.storeTrue()); subparser.addArgument("--mention") .nargs("*") .help("Mention another group member (syntax: start:length:recipientNumber)"); + subparser.addArgument("--text-style") + .nargs("*") + .help("Style parts of the message text (syntax: start:length:STYLE)"); 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."); @@ -67,7 +78,22 @@ 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-text-style") + .nargs("*") + .help("Quote with style parts of the message text (syntax: start:length:STYLE)"); 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)."); + 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 @@ -107,17 +133,16 @@ public class SendCommand implements JsonRpcLocalCommand { final var sticker = stickerString == null ? null : parseSticker(stickerString); var messageText = ns.getString("message"); - if (messageText == null) { - if (sticker != null) { - messageText = ""; - } else { - logger.debug("Reading message from stdin..."); - try { - messageText = IOUtils.readAll(System.in, Charset.defaultCharset()); - } catch (IOException e) { - throw new UserErrorException("Failed to read message from stdin: " + e.getMessage()); - } + final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE; + 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 attachments = ns.getList("attachment"); @@ -125,8 +150,15 @@ public class SendCommand implements JsonRpcLocalCommand { attachments = List.of(); } + final var selfNumber = m.getSelfNumber(); + List mentionStrings = ns.getList("mention"); - final var mentions = mentionStrings == null ? List.of() : parseMentions(m, mentionStrings); + final var mentions = mentionStrings == null + ? List.of() + : parseMentions(selfNumber, mentionStrings); + + List textStyleStrings = ns.getList("text-style"); + final var textStyles = textStyleStrings == null ? List.of() : parseTextStyles(textStyleStrings); final Message.Quote quote; final var quoteTimestamp = ns.getLong("quote-timestamp"); @@ -136,21 +168,63 @@ public class SendCommand implements JsonRpcLocalCommand { List quoteMentionStrings = ns.getList("quote-mention"); final var quoteMentions = quoteMentionStrings == null ? List.of() - : parseMentions(m, quoteMentionStrings); + : parseMentions(selfNumber, quoteMentionStrings); + List quoteTextStyleStrings = ns.getList("quote-text-style"); + final var quoteTextStyles = quoteTextStyleStrings == null + ? List.of() + : parseTextStyles(quoteTextStyleStrings); quote = new Message.Quote(quoteTimestamp, - CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()), + CommandUtil.getSingleRecipientIdentifier(quoteAuthor, selfNumber), quoteMessage == null ? "" : quoteMessage, - quoteMentions); + quoteMentions, + quoteTextStyles); } else { quote = null; } + final List 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(); + } + + 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, selfNumber)); + } 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, + final var message = new Message(messageText, attachments, mentions, Optional.ofNullable(quote), - Optional.ofNullable(sticker)), recipientIdentifiers); + Optional.ofNullable(sticker), + previews, + Optional.ofNullable((storyReply)), + textStyles); + 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() @@ -165,26 +239,51 @@ public class SendCommand implements JsonRpcLocalCommand { } private List parseMentions( - final Manager m, final List mentionStrings + final String selfNumber, final List mentionStrings ) throws UserErrorException { List 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); if (!matcher.matches()) { throw new UserErrorException("Invalid mention syntax (" + mention - + ") expected 'start:end:recipientNumber'"); + + ") expected 'start:length:recipientNumber'"); } - mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3), - m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)))); + mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3), selfNumber), + Integer.parseInt(matcher.group(1)), + Integer.parseInt(matcher.group(2)))); } return mentions; } + private List parseTextStyles( + final List textStylesStrings + ) throws UserErrorException { + List textStyles; + final Pattern textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)"); + textStyles = new ArrayList<>(); + for (final var textStyle : textStylesStrings) { + final var matcher = textStylePattern.matcher(textStyle); + if (!matcher.matches()) { + throw new UserErrorException("Invalid textStyle syntax (" + + textStyle + + ") expected 'start:length:STYLE'"); + } + final var style = TextStyle.Style.from(matcher.group(3)); + if (style == null) { + throw new UserErrorException("Invalid style: " + matcher.group(3)); + } + textStyles.add(new TextStyle(style, + Integer.parseInt(matcher.group(1)), + Integer.parseInt(matcher.group(2)))); + } + return textStyles; + } + 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 ("