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.UserErrorException;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
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.Map;
-public class SendReactionCommand implements DbusCommand, JsonRpcLocalCommand {
+import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
+
+public class SendReactionCommand implements JsonRpcLocalCommand {
@Override
public String getName() {
subparser.help("Send reaction to a previously received or sent message.");
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("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
subparser.addArgument("--note-to-self")
.help("Send the reaction to self without notification.")
.action(Arguments.storeTrue());
.type(long.class)
.help("Specify the timestamp of the message to which to react.");
subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());
+ subparser.addArgument("--story")
+ .help("React to a story instead of a normal message")
+ .action(Arguments.storeTrue());
}
@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 isNoteToSelf = ns.getBoolean("note-to-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 emoji = ns.getString("emoji");
- final var isRemove = ns.getBoolean("remove");
+ final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
final var targetAuthor = ns.getString("target-author");
final var targetTimestamp = ns.getLong("target-timestamp");
+ final var isStory = Boolean.TRUE.equals(ns.getBoolean("story"));
+ final RecipientIdentifier.Single targetAuthorIdentifier;
+ if (targetAuthor == null && recipientIdentifiers.size() == 1 && recipientIdentifiers.stream()
+ .findFirst()
+ .get() instanceof RecipientIdentifier.Single single) {
+ targetAuthorIdentifier = single;
+ } else {
+ targetAuthorIdentifier = CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber());
+ }
try {
final var results = m.sendMessageReaction(emoji,
isRemove,
- CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getUsername()),
+ targetAuthorIdentifier,
targetTimestamp,
- recipientIdentifiers);
- outputResult(outputWriter, results.getTimestamp());
- ErrorUtils.handleSendMessageResults(results.getResults());
- } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ recipientIdentifiers,
+ isStory);
+ outputResult(outputWriter, results);
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new UserErrorException(e.getMessage());
} catch (IOException e) {
- throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
- }
- }
-
- @Override
- public void handleCommand(
- final Namespace ns, final Signal signal, final OutputWriter outputWriter
- ) throws CommandException {
- final var recipients = ns.<String>getList("recipient");
- final var groupIdStrings = ns.<String>getList("group-id");
-
- final var noRecipients = recipients == null || recipients.isEmpty();
- final var noGroups = groupIdStrings == null || groupIdStrings.isEmpty();
- if (noRecipients && noGroups) {
- 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");
- }
-
- 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 {
- 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 {
- timestamp = signal.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, 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.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());
- }
- }
-
- 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));
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+ .getSimpleName() + ")", e);
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
}
}
}
git.nmode.ca / signal-cli / blobdiff
