X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e74be0c345321888c1fbfa05616cb90cf3f07ffb..221d937eecca5c9b09a3bee7df812203b9927a56:/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 2a9afa74..b9cbc047 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -4,6 +4,10 @@ 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.commands.exceptions.CommandException; +import org.asamk.signal.commands.exceptions.IOErrorException; +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; @@ -18,11 +22,6 @@ import java.io.IOException; import java.util.List; import static org.asamk.signal.util.ErrorUtils.handleAssertionError; -import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException; -import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException; -import static org.asamk.signal.util.ErrorUtils.handleIOException; -import static org.asamk.signal.util.ErrorUtils.handleInvalidNumberException; -import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException; import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults; public class SendReactionCommand implements LocalCommand { @@ -46,49 +45,54 @@ public class SendReactionCommand implements LocalCommand { } @Override - public int handleCommand(final Namespace ns, final Manager m) { - if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && 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) throws CommandException { + final List recipients = ns.getList("recipient"); + final var groupIdString = ns.getString("group"); + + final var noRecipients = recipients == null || recipients.isEmpty(); + if (noRecipients && groupIdString == null) { + throw new UserErrorException("No recipients given"); + } + if (!noRecipients && groupIdString != null) { + throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time"); } - String emoji = ns.getString("emoji"); - boolean isRemove = ns.getBoolean("remove"); - String targetAuthor = ns.getString("target_author"); - long targetTimestamp = ns.getLong("target_timestamp"); + 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()); + } + } try { - final Pair> results; - if (ns.getString("group") != null) { - GroupId groupId = Util.decodeGroupId(ns.getString("group")); + if (groupId != null) { results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId); } else { - results = m.sendMessageReaction(emoji, - isRemove, - targetAuthor, - targetTimestamp, - ns.getList("recipient")); + results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients); } - return handleTimestampAndSendMessageResults(results.first(), results.second()); + handleTimestampAndSendMessageResults(writer, results.first(), results.second()); } catch (IOException e) { - handleIOException(e); - return 3; + throw new IOErrorException("Failed to send message: " + e.getMessage()); } catch (AssertionError e) { handleAssertionError(e); - return 1; + throw e; } catch (GroupNotFoundException e) { - handleGroupNotFoundException(e); - return 1; + throw new UserErrorException("Failed to send to group: " + e.getMessage()); } catch (NotAGroupMemberException e) { - handleNotAGroupMemberException(e); - return 1; - } catch (GroupIdFormatException e) { - handleGroupIdFormatException(e); - return 1; + throw new UserErrorException("Failed to send to group: " + e.getMessage()); } catch (InvalidNumberException e) { - handleInvalidNumberException(e); - return 1; + throw new UserErrorException("Invalid number: " + e.getMessage()); } } }