public class SendCommand implements JsonRpcLocalCommand {
- private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+ private static final Logger logger = LoggerFactory.getLogger(SendCommand.class);
@Override
public String getName() {
subparser.help("Send a message to another user or group.");
subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+ subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
subparser.addArgument("--note-to-self")
.help("Send the message to self without notification.")
.action(Arguments.storeTrue());
+ subparser.addArgument("--notify-self")
+ .help("If self is part of recipients/groups send a normal message, not a sync message.")
+ .action(Arguments.storeTrue());
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:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>.");
+ subparser.addArgument("--view-once")
+ .action(Arguments.storeTrue())
+ .help("Send the message as a view once message");
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)");
+ .help("Mention another group member (syntax: start:length:recipientNumber). "
+ + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
subparser.addArgument("--text-style")
.nargs("*")
- .help("Style parts of the message text (syntax: start:length:STYLE)");
+ .help("Style parts of the message text (syntax: start:length:STYLE). "
+ + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
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.");
.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'.");
+ .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)");
@Override
public void handleCommand(
- final Namespace ns, final Manager m, final OutputWriter outputWriter
+ final Namespace ns,
+ final Manager m,
+ final OutputWriter outputWriter
) throws CommandException {
+ final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self"));
final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
final var recipientStrings = ns.<String>getList("recipient");
final var groupIdStrings = ns.<String>getList("group-id");
+ final var usernameStrings = ns.<String>getList("username");
final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
isNoteToSelf,
recipientStrings,
- groupIdStrings);
+ groupIdStrings,
+ usernameStrings);
final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session"));
if (isEndSession) {
if (attachments == null) {
attachments = List.of();
}
+ final var viewOnce = Boolean.TRUE.equals(ns.getBoolean("view-once"));
final var selfNumber = m.getSelfNumber();
final var quoteTimestamp = ns.getLong("quote-timestamp");
if (quoteTimestamp != null) {
final var quoteAuthor = ns.getString("quote-author");
+ if (quoteAuthor == null) {
+ throw new UserErrorException("Quote author parameter is missing");
+ }
final var quoteMessage = ns.getString("quote-message");
final var quoteMentionStrings = ns.<String>getList("quote-mention");
final var quoteMentions = quoteMentionStrings == null
try {
final var message = new Message(messageText,
attachments,
+ viewOnce,
mentions,
Optional.ofNullable(quote),
Optional.ofNullable(sticker),
textStyles);
var results = editTimestamp != null
? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
- : m.sendMessage(message, recipientIdentifiers);
+ : m.sendMessage(message, recipientIdentifiers, notifySelf);
outputResult(outputWriter, results);
} catch (AttachmentInvalidException | IOException e) {
- throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
- .getSimpleName() + ")", e);
+ if (e instanceof IOException io && io.getMessage().contains("No prekeys available")) {
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+ .getSimpleName() + "), maybe one of the devices of the recipient wasn't online for a while.",
+ e);
+ } else {
+ 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) {
}
private List<Message.Mention> parseMentions(
- final String selfNumber, final List<String> mentionStrings
+ final String selfNumber,
+ final List<String> mentionStrings
) throws UserErrorException {
final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
final var mentions = new ArrayList<Message.Mention>();
git.nmode.ca / signal-cli / blobdiff
