X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/7f64a9812ca5bb10e8f57cacf3d22b904bd200b4..5d83e149b3ed61683da20bba6703a37db66f93cf:/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 c29d0268..4d3f80aa 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -4,36 +4,34 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.Signal; -import org.asamk.signal.JsonWriter; -import org.asamk.signal.OutputWriter; -import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException; -import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException; 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.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.OutputWriter; import org.asamk.signal.util.CommandUtil; -import org.asamk.signal.util.ErrorUtils; import org.asamk.signal.util.IOUtils; -import org.freedesktop.dbus.errors.UnknownObject; -import org.freedesktop.dbus.exceptions.DBusExecutionException; 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; -public class SendCommand implements DbusCommand, JsonRpcLocalCommand { +import static org.asamk.signal.util.SendMessageResultUtils.outputResult; + +public class SendCommand implements JsonRpcLocalCommand { private final static Logger logger = LoggerFactory.getLogger(SendCommand.class); @@ -56,13 +54,24 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand { 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("--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-author").help("Specify the number of the author of the original message."); + subparser.addArgument("--quote-message").help("Specify the message of the original message."); + subparser.addArgument("--quote-mention") + .nargs("*") + .help("Quote with mention of another group member (syntax: start:length:recipientNumber)"); } @Override public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - final var isNoteToSelf = ns.getBoolean("note-to-self"); + final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self")); final var recipientStrings = ns.getList("recipient"); final var groupIdStrings = ns.getList("group-id"); @@ -71,7 +80,7 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand { recipientStrings, groupIdStrings); - final var isEndSession = ns.getBoolean("end-session"); + final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session")); if (isEndSession) { final var singleRecipients = recipientIdentifiers.stream() .filter(r -> r instanceof RecipientIdentifier.Single) @@ -82,15 +91,18 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand { } try { - m.sendEndSessionMessage(singleRecipients); + final var results = m.sendEndSessionMessage(singleRecipients); + outputResult(outputWriter, results); return; } catch (IOException e) { - throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); + throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() + .getSimpleName() + ")", e); } } var messageText = ns.getString("message"); if (messageText == null) { + logger.debug("Reading message from stdin..."); try { messageText = IOUtils.readAll(System.in, Charset.defaultCharset()); } catch (IOException e) { @@ -103,110 +115,56 @@ public class SendCommand implements DbusCommand, JsonRpcLocalCommand { attachments = List.of(); } + List mentionStrings = ns.getList("mention"); + final var mentions = mentionStrings == null ? List.of() : parseMentions(m, mentionStrings); + + 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 quoteMentionStrings = ns.getList("quote-mention"); + final var quoteMentions = quoteMentionStrings == null + ? List.of() + : parseMentions(m, quoteMentionStrings); + quote = new Message.Quote(quoteTimestamp, + CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()), + quoteMessage, + quoteMentions); + } else { + quote = null; + } + try { - var results = m.sendMessage(new Message(messageText, attachments), recipientIdentifiers); - outputResult(outputWriter, results.getTimestamp()); - ErrorUtils.handleSendMessageResults(results.getResults()); + var results = m.sendMessage(new Message(messageText, attachments, mentions, Optional.ofNullable(quote)), + recipientIdentifiers); + outputResult(outputWriter, results); } catch (AttachmentInvalidException | IOException e) { - throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); + 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."); } } - @Override - public void handleCommand( - final Namespace ns, final Signal signal, final OutputWriter outputWriter - ) throws CommandException { - final var recipients = ns.getList("recipient"); - final var isEndSession = ns.getBoolean("end-session"); - final var groupIdStrings = ns.getList("group-id"); - final var isNoteToSelf = ns.getBoolean("note-to-self"); - - final var noRecipients = recipients == null || recipients.isEmpty(); - final var noGroups = groupIdStrings == null || groupIdStrings.isEmpty(); - if ((noRecipients && isEndSession) || (noRecipients && noGroups && !isNoteToSelf)) { - throw new UserErrorException("No recipients given"); - } - if (!noRecipients && !noGroups) { - throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time"); - } - if (!noRecipients && isNoteToSelf) { - throw new UserErrorException( - "You cannot specify recipients by phone number and note to self at the same time"); - } - - if (isEndSession) { - try { - signal.sendEndSessionMessage(recipients); - return; - } catch (Signal.Error.UntrustedIdentity e) { - throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage()); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); - } - } - - var messageText = ns.getString("message"); - if (messageText == null) { - try { - messageText = IOUtils.readAll(System.in, Charset.defaultCharset()); - } catch (IOException e) { - throw new UserErrorException("Failed to read message from stdin: " + e.getMessage()); - } - } - - List attachments = ns.getList("attachment"); - if (attachments == null) { - attachments = List.of(); - } - - if (!noGroups) { - final var groupIds = CommandUtil.getGroupIds(groupIdStrings); - - try { - long timestamp = 0; - for (final var groupId : groupIds) { - timestamp = signal.sendGroupMessage(messageText, attachments, groupId.serialize()); - } - outputResult(outputWriter, timestamp); - return; - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException("Failed to send group message: " + e.getMessage()); - } - } - - if (isNoteToSelf) { - try { - var timestamp = signal.sendNoteToSelfMessage(messageText, attachments); - outputResult(outputWriter, timestamp); - return; - } catch (Signal.Error.UntrustedIdentity e) { - throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage()); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException("Failed to send note to self message: " + e.getMessage()); + private List parseMentions( + final Manager m, final List mentionStrings + ) throws UserErrorException { + List mentions; + final Pattern mentionPattern = Pattern.compile("([0-9]+):([0-9]+):(.+)"); + 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'"); } + mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3), + m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)))); } - - try { - var timestamp = signal.sendMessage(messageText, attachments, recipients); - outputResult(outputWriter, timestamp); - } catch (UnknownObject e) { - throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage()); - } catch (Signal.Error.UntrustedIdentity e) { - throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage()); - } catch (DBusExecutionException e) { - throw new UnexpectedErrorException("Failed to send message: " + e.getMessage()); - } - } - - private void outputResult(final OutputWriter outputWriter, final long timestamp) { - if (outputWriter instanceof PlainTextWriter) { - final var writer = (PlainTextWriter) outputWriter; - writer.println("{}", timestamp); - } else { - final var writer = (JsonWriter) outputWriter; - writer.write(Map.of("timestamp", timestamp)); - } + return mentions; } }