From: AsamK Date: Sun, 24 Nov 2024 10:51:54 +0000 (+0100) Subject: Add simplification for single recipient reactions X-Git-Tag: v0.13.10~5 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/fe752e0c7998bc8ca66c46d981624e6fbce7abf9 Add simplification for single recipient reactions --- diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index da877d76..a95a0b5a 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -11,6 +11,7 @@ import org.asamk.signal.manager.Manager; 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; @@ -74,10 +75,18 @@ public class SendReactionCommand implements JsonRpcLocalCommand { 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.getSelfNumber()), + targetAuthorIdentifier, targetTimestamp, recipientIdentifiers, isStory);