import org.asamk.signal.commands.exceptions.UserErrorException;
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;
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-attachment")
+ .nargs("*")
+ .help("Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]], e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.");
+ 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).");
messageText = "";
}
- List<String> attachments = ns.getList("attachment");
+ var attachments = ns.<String>getList("attachment");
if (attachments == null) {
attachments = List.of();
}
- List<String> mentionStrings = ns.getList("mention");
- final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
+ final var selfNumber = m.getSelfNumber();
+
+ final var mentionStrings = ns.<String>getList("mention");
+ final var mentions = mentionStrings == null
+ ? List.<Message.Mention>of()
+ : parseMentions(selfNumber, mentionStrings);
+
+ final var textStyleStrings = ns.<String>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 quoteAuthor = ns.getString("quote-author");
final var quoteMessage = ns.getString("quote-message");
- List<String> quoteMentionStrings = ns.getList("quote-mention");
+ final var quoteMentionStrings = ns.<String>getList("quote-mention");
final var quoteMentions = quoteMentionStrings == null
? List.<Message.Mention>of()
- : parseMentions(m, quoteMentionStrings);
+ : parseMentions(selfNumber, quoteMentionStrings);
+ final var quoteTextStyleStrings = ns.<String>getList("quote-text-style");
+ final var quoteAttachmentStrings = ns.<String>getList("quote-attachment");
+ final var quoteTextStyles = quoteTextStyleStrings == null
+ ? List.<TextStyle>of()
+ : parseTextStyles(quoteTextStyleStrings);
+ final var quoteAttachments = quoteAttachmentStrings == null
+ ? List.<Message.Quote.Attachment>of()
+ : parseQuoteAttachments(quoteAttachmentStrings);
quote = new Message.Quote(quoteTimestamp,
- CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
+ CommandUtil.getSingleRecipientIdentifier(quoteAuthor, selfNumber),
quoteMessage == null ? "" : quoteMessage,
- quoteMentions);
+ quoteMentions,
+ quoteTextStyles,
+ quoteAttachments);
} else {
quote = null;
}
final List<Message.Preview> previews;
- String previewUrl = ns.getString("preview-url");
+ final var 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");
+ final var previewTitle = ns.getString("preview-title");
+ final var previewDescription = ns.getString("preview-description");
+ final var previewImage = ns.getString("preview-image");
previews = List.of(new Message.Preview(previewUrl,
Optional.ofNullable(previewTitle).orElse(""),
Optional.ofNullable(previewDescription).orElse(""),
if (storyReplyTimestamp != null) {
final var storyAuthor = ns.getString("story-author");
storyReply = new Message.StoryReply(storyReplyTimestamp,
- CommandUtil.getSingleRecipientIdentifier(storyAuthor, m.getSelfNumber()));
+ CommandUtil.getSingleRecipientIdentifier(storyAuthor, selfNumber));
} else {
storyReply = null;
}
Optional.ofNullable(quote),
Optional.ofNullable(sticker),
previews,
- Optional.ofNullable((storyReply)));
+ Optional.ofNullable((storyReply)),
+ textStyles);
var results = editTimestamp != null
? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
: m.sendMessage(message, recipientIdentifiers);
}
private List<Message.Mention> parseMentions(
- final Manager m, final List<String> mentionStrings
+ final String selfNumber, final List<String> mentionStrings
) throws UserErrorException {
- List<Message.Mention> mentions;
- final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
- mentions = new ArrayList<>();
+ final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+ final var mentions = new ArrayList<Message.Mention>();
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<TextStyle> parseTextStyles(
+ final List<String> textStylesStrings
+ ) throws UserErrorException {
+ final var textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+ final var textStyles = new ArrayList<TextStyle>();
+ 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("([\\da-f]+):(\\d+)");
+ final var 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 ("
}
return new Message.Sticker(Hex.toByteArray(matcher.group(1)), Integer.parseInt(matcher.group(2)));
}
+
+ private List<Message.Quote.Attachment> parseQuoteAttachments(
+ final List<String> attachmentStrings
+ ) throws UserErrorException {
+ final var attachmentPattern = Pattern.compile("([^:]+)(:([^:]+)(:(.+))?)?");
+ final var attachments = new ArrayList<Message.Quote.Attachment>();
+ for (final var attachment : attachmentStrings) {
+ final var matcher = attachmentPattern.matcher(attachment);
+ if (!matcher.matches()) {
+ throw new UserErrorException("Invalid attachment syntax ("
+ + attachment
+ + ") expected 'contentType[:filename[:previewFile]]'");
+ }
+ attachments.add(new Message.Quote.Attachment(matcher.group(1), matcher.group(3), matcher.group(5)));
+ }
+ return attachments;
+ }
}
git.nmode.ca / signal-cli / blobdiff
