package org.asamk.signal.commands;
import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.Signal;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.groups.GroupIdFormatException;
import org.asamk.signal.util.IOUtils;
import org.asamk.signal.util.Util;
import org.freedesktop.dbus.errors.UnknownObject;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.List;
-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
-
public class SendCommand implements DbusCommand {
- @Override
- public void attachToSubparser(final Subparser subparser) {
+ private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+ private final OutputWriter outputWriter;
+
+ public SendCommand(final OutputWriter outputWriter) {
+ this.outputWriter = outputWriter;
+ }
+
+ public static void attachToSubparser(final Subparser subparser) {
+ subparser.help("Send a message to another user or group.");
subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
- final MutuallyExclusiveGroup mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
- mutuallyExclusiveGroup.addArgument("-g", "--group").help("Specify the recipient group ID.");
+ final var mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
+ mutuallyExclusiveGroup.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.");
mutuallyExclusiveGroup.addArgument("--note-to-self")
.help("Send the message to self without notification.")
.action(Arguments.storeTrue());
subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used.");
subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
- subparser.addArgument("-e", "--endsession")
+ subparser.addArgument("-e", "--end-session", "--endsession")
.help("Clear session state and send end session message.")
.action(Arguments.storeTrue());
}
@Override
- public int handleCommand(final Namespace ns, final Signal signal) {
+ public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
final List<String> recipients = ns.getList("recipient");
- final Boolean isEndSession = ns.getBoolean("endsession");
- final String groupIdString = ns.getString("group");
- final Boolean isNoteToSelf = ns.getBoolean("note_to_self");
+ final var isEndSession = ns.getBoolean("end-session");
+ final var groupIdString = ns.getString("group-id");
+ final var isNoteToSelf = ns.getBoolean("note-to-self");
- final boolean noRecipients = recipients == null || recipients.isEmpty();
+ final var noRecipients = recipients == null || recipients.isEmpty();
if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) {
- System.err.println("No recipients given");
- System.err.println("Aborting sending.");
- return 1;
+ throw new UserErrorException("No recipients given");
}
if (!noRecipients && groupIdString != null) {
- System.err.println("You cannot specify recipients by phone number and groups at the same time");
- return 1;
+ throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time");
}
if (!noRecipients && isNoteToSelf) {
- System.err.println("You cannot specify recipients by phone number and not to self at the same time");
- return 1;
+ throw new UserErrorException(
+ "You cannot specify recipients by phone number and note to self at the same time");
}
if (isEndSession) {
try {
signal.sendEndSessionMessage(recipients);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
+ return;
+ } catch (Signal.Error.UntrustedIdentity e) {
+ throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage());
} catch (DBusExecutionException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return 2;
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
}
}
- String messageText = ns.getString("message");
+ var messageText = ns.getString("message");
if (messageText == null) {
try {
messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
} catch (IOException e) {
- System.err.println("Failed to read message from stdin: " + e.getMessage());
- System.err.println("Aborting sending.");
- return 1;
+ throw new UserErrorException("Failed to read message from stdin: " + e.getMessage());
}
}
attachments = List.of();
}
+ final var writer = (PlainTextWriterImpl) outputWriter;
+
if (groupIdString != null) {
+ byte[] groupId;
+ try {
+ groupId = Util.decodeGroupId(groupIdString).serialize();
+ } catch (GroupIdFormatException e) {
+ throw new UserErrorException("Invalid group id: " + e.getMessage());
+ }
+
try {
- byte[] groupId;
- try {
- groupId = Util.decodeGroupId(groupIdString).serialize();
- } catch (GroupIdFormatException e) {
- handleGroupIdFormatException(e);
- return 1;
- }
-
- long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
- System.out.println(timestamp);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
+ var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
+ writer.println("{}", timestamp);
+ return;
} catch (DBusExecutionException e) {
- System.err.println("Failed to send group message: " + e.getMessage());
- return 2;
+ throw new UnexpectedErrorException("Failed to send group message: " + e.getMessage());
}
}
if (isNoteToSelf) {
try {
- long timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
- System.out.println(timestamp);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
+ var timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
+ writer.println("{}", timestamp);
+ return;
+ } catch (Signal.Error.UntrustedIdentity e) {
+ throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage());
} catch (DBusExecutionException e) {
- System.err.println("Failed to send note to self message: " + e.getMessage());
- return 2;
+ throw new UnexpectedErrorException("Failed to send note to self message: " + e.getMessage());
}
}
try {
- long timestamp = signal.sendMessage(messageText, attachments, recipients);
- System.out.println(timestamp);
- return 0;
- } catch (AssertionError e) {
- handleAssertionError(e);
- return 1;
+ var timestamp = signal.sendMessage(messageText, attachments, recipients);
+ writer.println("{}", timestamp);
} catch (UnknownObject e) {
- System.err.println("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
- return 1;
+ throw new UserErrorException("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());
+ } catch (Signal.Error.UntrustedIdentity e) {
+ throw new UntrustedKeyErrorException("Failed to send message: " + e.getMessage());
} catch (DBusExecutionException e) {
- System.err.println("Failed to send message: " + e.getMessage());
- return 2;
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
}
}
}
git.nmode.ca / signal-cli / blobdiff
