X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/d72b838560b1a4186ac121c7d605773b49fcdf46..d248f249e37f7b35a3b7dd69f2a06af8eddd3996:/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java index 5dd29682..6ba8a40c 100644 --- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java @@ -3,15 +3,17 @@ package org.asamk.signal.commands; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.OutputWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.Manager; -import org.asamk.signal.manager.UntrustedIdentityException; +import org.asamk.signal.manager.api.SendMessageResults; +import org.asamk.signal.output.OutputWriter; import org.asamk.signal.util.CommandUtil; import java.io.IOException; +import static org.asamk.signal.util.SendMessageResultUtils.outputResult; + public class SendReceiptCommand implements JsonRpcLocalCommand { @Override @@ -43,14 +45,16 @@ public class SendReceiptCommand implements JsonRpcLocalCommand { final var type = ns.getString("type"); try { + final SendMessageResults results; if (type == null || "read".equals(type)) { - m.sendReadReceipt(recipient, targetTimestamps); + results = m.sendReadReceipt(recipient, targetTimestamps); } else if ("viewed".equals(type)) { - m.sendViewedReceipt(recipient, targetTimestamps); + results = m.sendViewedReceipt(recipient, targetTimestamps); } else { throw new UserErrorException("Unknown receipt type: " + type); } - } catch (IOException | UntrustedIdentityException e) { + outputResult(outputWriter, results); + } catch (IOException e) { throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass() .getSimpleName() + ")"); }