X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6:/src/main/java/org/asamk/signal/commands/SendReactionCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index b9cbc047..11a16b2e 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -4,33 +4,40 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.PlainTextWriterImpl; +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.IOErrorException; +import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.groups.GroupId; -import org.asamk.signal.manager.groups.GroupIdFormatException; 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.Util; -import org.whispersystems.libsignal.util.Pair; -import org.whispersystems.signalservice.api.messages.SendMessageResult; -import org.whispersystems.signalservice.api.util.InvalidNumberException; +import org.asamk.signal.util.CommandUtil; +import org.asamk.signal.util.ErrorUtils; +import org.freedesktop.dbus.errors.UnknownObject; +import org.freedesktop.dbus.exceptions.DBusExecutionException; import java.io.IOException; -import java.util.List; +import java.util.Map; -import static org.asamk.signal.util.ErrorUtils.handleAssertionError; -import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults; +public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand { -public class SendReactionCommand implements LocalCommand { + @Override + public String getName() { + return "sendReaction"; + } @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Send reaction to a previously received or sent message."); - subparser.addArgument("-g", "--group").help("Specify the recipient group ID."); + subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*"); subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*"); + subparser.addArgument("--note-to-self") + .help("Send the reaction to self without notification.") + .action(Arguments.storeTrue()); subparser.addArgument("-e", "--emoji") .required(true) .help("Specify the emoji, should be a single unicode grapheme cluster."); @@ -45,54 +52,94 @@ public class SendReactionCommand implements LocalCommand { } @Override - public void handleCommand(final Namespace ns, final Manager m) throws CommandException { - final List recipients = ns.getList("recipient"); - final var groupIdString = ns.getString("group"); + public void handleCommand( + final Namespace ns, final Manager m, final OutputWriter outputWriter + ) throws CommandException { + final var isNoteToSelf = 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 emoji = ns.getString("emoji"); + final var isRemove = ns.getBoolean("remove"); + final var targetAuthor = ns.getString("target-author"); + final var targetTimestamp = ns.getLong("target-timestamp"); + + try { + final var results = m.sendMessageReaction(emoji, + isRemove, + CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getUsername()), + targetTimestamp, + recipientIdentifiers); + outputResult(outputWriter, results.getTimestamp()); + ErrorUtils.handleSendMessageResults(results.getResults()); + } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) { + throw new UserErrorException(e.getMessage()); + } catch (IOException e) { + throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() + .getSimpleName() + ")"); + } + } + + @Override + public void handleCommand( + final Namespace ns, final Signal signal, final OutputWriter outputWriter + ) throws CommandException { + final var recipients = ns.getList("recipient"); + final var groupIdStrings = ns.getList("group-id"); final var noRecipients = recipients == null || recipients.isEmpty(); - if (noRecipients && groupIdString == null) { + final var noGroups = groupIdStrings == null || groupIdStrings.isEmpty(); + if (noRecipients && noGroups) { throw new UserErrorException("No recipients given"); } - if (!noRecipients && groupIdString != null) { + if (!noRecipients && !noGroups) { throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time"); } final var emoji = ns.getString("emoji"); - final boolean isRemove = ns.getBoolean("remove"); - final var targetAuthor = ns.getString("target_author"); - final long targetTimestamp = ns.getLong("target_timestamp"); - - final var writer = new PlainTextWriterImpl(System.out); - - final Pair> results; - - GroupId groupId = null; - if (groupId != null) { - try { - groupId = Util.decodeGroupId(groupIdString); - } catch (GroupIdFormatException e) { - throw new UserErrorException("Invalid group id:" + e.getMessage()); - } - } + final var isRemove = ns.getBoolean("remove"); + final var targetAuthor = ns.getString("target-author"); + final var targetTimestamp = ns.getLong("target-timestamp"); try { - if (groupId != null) { - results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId); + long timestamp = 0; + if (!noGroups) { + final var groupIds = CommandUtil.getGroupIds(groupIdStrings); + for (final var groupId : groupIds) { + timestamp = signal.sendGroupMessageReaction(emoji, + isRemove, + targetAuthor, + targetTimestamp, + groupId.serialize()); + } } else { - results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients); + timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients); } - handleTimestampAndSendMessageResults(writer, results.first(), results.second()); - } catch (IOException e) { - throw new IOErrorException("Failed to send message: " + e.getMessage()); - } catch (AssertionError e) { - handleAssertionError(e); - throw e; - } catch (GroupNotFoundException e) { - throw new UserErrorException("Failed to send to group: " + e.getMessage()); - } catch (NotAGroupMemberException e) { - throw new UserErrorException("Failed to send to group: " + e.getMessage()); - } catch (InvalidNumberException e) { + outputResult(outputWriter, timestamp); + } catch (UnknownObject e) { + throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage()); + } catch (Signal.Error.InvalidNumber e) { throw new UserErrorException("Invalid number: " + e.getMessage()); + } catch (Signal.Error.GroupNotFound e) { + throw new UserErrorException("Failed to send to group: " + e.getMessage()); + } catch (DBusExecutionException e) { + throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() + .getSimpleName() + ")"); + } + } + + 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)); } } }