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.TextStyle;
import org.asamk.signal.manager.api.UnregisteredRecipientException;
import org.asamk.signal.manager.groups.GroupNotFoundException;
import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
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;
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("--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.");
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
var messageText = ns.getString("message");
final var readMessageFromStdin = ns.getBoolean("message-from-stdin") == Boolean.TRUE;
- if (readMessageFromStdin || (messageText == null && sticker == null)) {
+ 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<String> attachments = ns.getList("attachment");
List<String> mentionStrings = ns.getList("mention");
final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
+ List<String> textStyleStrings = ns.getList("text-style");
+ final var textStyles = textStyleStrings == null ? List.<TextStyle>of() : parseTextStyles(textStyleStrings);
+
final Message.Quote quote;
final var quoteTimestamp = ns.getLong("quote-timestamp");
if (quoteTimestamp != null) {
final var quoteMentions = quoteMentionStrings == null
? List.<Message.Mention>of()
: parseMentions(m, quoteMentionStrings);
+ List<String> quoteTextStyleStrings = ns.getList("quote-text-style");
+ final var quoteTextStyles = quoteTextStyleStrings == null
+ ? List.<TextStyle>of()
+ : parseTextStyles(quoteTextStyleStrings);
quote = new Message.Quote(quoteTimestamp,
CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
quoteMessage == null ? "" : quoteMessage,
- quoteMentions);
+ quoteMentions,
+ quoteTextStyles);
} else {
quote = null;
}
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 == null ? "" : messageText,
+ final var message = new Message(messageText,
attachments,
mentions,
Optional.ofNullable(quote),
Optional.ofNullable(sticker),
- previews), recipientIdentifiers);
+ 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()
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);
return mentions;
}
+ private List<TextStyle> parseTextStyles(
+ final List<String> textStylesStrings
+ ) throws UserErrorException {
+ List<TextStyle> 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 ("
git.nmode.ca / signal-cli / blobdiff
