X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/fc76c9badf720c647aef99f6a9390111dc68e0ef..4a1af0786c938f887a109a17dcc879da21704a8b:/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 a4bdc89b..e22d307b 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -4,104 +4,120 @@ 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.manager.groups.GroupIdFormatException; +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.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.util.CommandUtil; +import org.asamk.signal.util.ErrorUtils; import org.asamk.signal.util.IOUtils; -import org.asamk.signal.util.Util; -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.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()); } @Override - public int handleCommand(final Namespace ns, final Signal signal) { - if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && ( - ns.getBoolean("endsession") || ns.getString("group") == null - )) { - System.err.println("No recipients given"); - System.err.println("Aborting sending."); - 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.getList("recipient"); + final var groupIdStrings = ns.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"); + } - if (ns.getBoolean("endsession")) { try { - signal.sendEndSessionMessage(ns.getList("recipient")); - return 0; - } catch (AssertionError e) { - handleAssertionError(e); - return 1; - } catch (DBusExecutionException e) { - System.err.println("Failed to send message: " + e.getMessage()); - return 1; + m.sendEndSessionMessage(singleRecipients); + 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 attachments = ns.getList("attachment"); if (attachments == null) { - attachments = new ArrayList<>(); + attachments = List.of(); } try { - if (ns.getString("group") != null) { - byte[] groupId; - try { - groupId = Util.decodeGroupId(ns.getString("group")).serialize(); - } catch (GroupIdFormatException e) { - handleGroupIdFormatException(e); - return 1; - } - - long timestamp = signal.sendGroupMessage(messageText, attachments, groupId); - System.out.println(timestamp); - return 0; - } - } catch (AssertionError e) { - handleAssertionError(e); - return 1; - } catch (DBusExecutionException e) { - System.err.println("Failed to send message: " + e.getMessage()); - return 1; + var results = m.sendMessage(new Message(messageText, attachments), 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()); } + } - try { - long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient")); - System.out.println(timestamp); - return 0; - } catch (AssertionError e) { - handleAssertionError(e); - return 1; - } catch (DBusExecutionException e) { - System.err.println("Failed to send message: " + e.getMessage()); - return 1; + 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)); } } }