import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
-import org.asamk.Signal;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
+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.Message;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+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.IOUtils;
-import org.asamk.signal.util.Util;
-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;
-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
+public class SendCommand implements JsonRpcLocalCommand {
-public class SendCommand implements DbusCommand {
+ private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+
+ @Override
+ public String getName() {
+ return "send";
+ }
@Override
public void attachToSubparser(final Subparser subparser) {
- subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+ 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("--note-to-self")
+ .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");
- subparser.addArgument("-e", "--endsession")
+ 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 int handleCommand(final Namespace ns, final Signal signal) {
- final List<String> recipients = ns.getList("recipient");
- final Boolean isEndSession = ns.getBoolean("endsession");
- final String groupIdString = ns.getString("group");
-
- final boolean noRecipients = recipients == null || recipients.isEmpty();
- if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null)) {
- System.err.println("No recipients given");
- System.err.println("Aborting sending.");
- return 1;
- }
- if (!noRecipients && groupIdString != null) {
- System.err.println("You cannot specify recipients by phone number and groups at the same time");
- return 1;
- }
+ public void handleCommand(
+ final Namespace ns, final Manager m, final OutputWriter outputWriter
+ ) throws CommandException {
+ 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 recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
+ isNoteToSelf,
+ recipientStrings,
+ groupIdStrings);
+ final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session"));
if (isEndSession) {
+ final var singleRecipients = recipientIdentifiers.stream()
+ .filter(r -> r instanceof RecipientIdentifier.Single)
+ .map(RecipientIdentifier.Single.class::cast)
+ .collect(Collectors.toSet());
+ if (singleRecipients.isEmpty()) {
+ throw new UserErrorException("No recipients given");
+ }
+
try {
- signal.sendEndSessionMessage(recipients);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
- } catch (DBusExecutionException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return 2;
+ final var results = m.sendEndSessionMessage(singleRecipients);
+ outputResult(outputWriter, results.timestamp());
+ ErrorUtils.handleSendMessageResults(results.results());
+ return;
+ } catch (IOException e) {
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+ .getSimpleName() + ")", e);
}
}
- String messageText = ns.getString("message");
+ var messageText = ns.getString("message");
if (messageText == null) {
try {
messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
} catch (IOException e) {
- System.err.println("Failed to read message from stdin: " + e.getMessage());
- System.err.println("Aborting sending.");
- return 1;
+ throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
}
}
List<String> attachments = ns.getList("attachment");
if (attachments == null) {
- attachments = new ArrayList<>();
+ attachments = List.of();
+ }
+
+ List<String> mentionStrings = ns.getList("mention");
+ final var mentions = mentionStrings == null ? List.<Message.Mention>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<String> quoteMentionStrings = ns.getList("quote-mention");
+ final var quoteMentions = quoteMentionStrings == null
+ ? List.<Message.Mention>of()
+ : parseMentions(m, quoteMentionStrings);
+ quote = new Message.Quote(quoteTimestamp,
+ CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
+ quoteMessage,
+ quoteMentions);
+ } else {
+ quote = null;
}
try {
- if (groupIdString != null) {
- byte[] groupId;
- try {
- groupId = Util.decodeGroupId(groupIdString).serialize();
- } catch (GroupIdFormatException e) {
- handleGroupIdFormatException(e);
- return 1;
- }
-
- long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
- System.out.println(timestamp);
- return 0;
+ var results = m.sendMessage(new Message(messageText, attachments, mentions, Optional.ofNullable(quote)),
+ recipientIdentifiers);
+ outputResult(outputWriter, results.timestamp());
+ ErrorUtils.handleSendMessageResults(results.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());
+ }
+ }
+
+ private List<Message.Mention> parseMentions(
+ final Manager m, final List<String> mentionStrings
+ ) throws UserErrorException {
+ List<Message.Mention> 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'");
}
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
- } catch (DBusExecutionException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return 2;
+ mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
+ m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
}
+ return mentions;
+ }
- try {
- long timestamp = signal.sendMessage(messageText, attachments, recipients);
- System.out.println(timestamp);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
- } catch (UnknownObject e) {
- System.err.println("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
- return 1;
- } catch (DBusExecutionException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return 2;
+ 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));
}
}
}
git.nmode.ca / signal-cli / blobdiff
