X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c3a9022bec11aa2c1333ce7ee1aae29b8212d760..8a31b7f2c153e89532010b9ab58eb045ddfe43fe:/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 1af21d53..9534f182 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -7,31 +7,31 @@ 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.InvalidStickerException; 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.JsonWriter; import org.asamk.signal.output.OutputWriter; -import org.asamk.signal.output.PlainTextWriter; import org.asamk.signal.util.CommandUtil; -import org.asamk.signal.util.ErrorUtils; +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 java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.regex.Pattern; import java.util.stream.Collectors; +import static org.asamk.signal.util.SendMessageResultUtils.outputResult; + public class SendCommand implements JsonRpcLocalCommand { private final static Logger logger = LoggerFactory.getLogger(SendCommand.class); @@ -50,8 +50,16 @@ 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()); @@ -66,6 +74,19 @@ public class SendCommand implements JsonRpcLocalCommand { 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)."); + 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 @@ -93,8 +114,7 @@ public class SendCommand implements JsonRpcLocalCommand { try { final var results = m.sendEndSessionMessage(singleRecipients); - outputResult(outputWriter, results.timestamp()); - ErrorUtils.handleSendMessageResults(results.results()); + outputResult(outputWriter, results); return; } catch (IOException e) { throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() @@ -102,14 +122,20 @@ public class SendCommand implements JsonRpcLocalCommand { } } + final var stickerString = ns.getString("sticker"); + final var sticker = stickerString == null ? null : parseSticker(stickerString); + var messageText = ns.getString("message"); - if (messageText == null) { + final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE; + if (readMessageFromStdin) { 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()); } + } else if (messageText == null) { + messageText = ""; } List attachments = ns.getList("attachment"); @@ -131,22 +157,64 @@ public class SendCommand implements JsonRpcLocalCommand { : parseMentions(m, quoteMentionStrings); quote = new Message.Quote(quoteTimestamp, CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()), - quoteMessage, + quoteMessage == null ? "" : quoteMessage, quoteMentions); } 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, 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, attachments, mentions, Optional.ofNullable(quote)), - recipientIdentifiers); - outputResult(outputWriter, results.timestamp()); - ErrorUtils.handleSendMessageResults(results.results()); + final var message = new Message(messageText, + attachments, + mentions, + Optional.ofNullable(quote), + Optional.ofNullable(sticker), + 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() .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); } } @@ -154,7 +222,7 @@ public class SendCommand implements JsonRpcLocalCommand { final Manager m, 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); @@ -169,12 +237,14 @@ public class SendCommand implements JsonRpcLocalCommand { return mentions; } - private void outputResult(final OutputWriter outputWriter, final long timestamp) { - if (outputWriter instanceof PlainTextWriter writer) { - writer.println("{}", timestamp); - } else { - final var writer = (JsonWriter) outputWriter; - writer.write(Map.of("timestamp", timestamp)); + 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))); } }