Use PlainTextWriter for all cli stdout output

[signal-cli] / src / main / java / org / asamk / signal / commands / SendCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index a805a12cb66b9a84d0177b9e6320873f7f375026..1976fb60339d3c15956495564b34b616a6f69bc2 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -5,44 +5,37 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.AttachmentInvalidException;
-import org.asamk.signal.manager.GroupNotFoundException;
-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.util.GroupIdFormatException;
+import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 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.freedesktop.dbus.exceptions.DBusExecutionException;

-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 import java.io.IOException;
 import java.nio.charset.Charset;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

-import java.util.ArrayList;

 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;

-import static org.asamk.signal.util.ErrorUtils.handleDBusExecutionException;
-import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;

 import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
 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;

 
 public class SendCommand implements DbusCommand {
 
 
 public class SendCommand implements DbusCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("recipient")
-                .help("Specify the recipients' phone number.")
-                .nargs("*");
-        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("recipient").help("Specify the recipients' phone number.").nargs("*");
+        final var mutuallyExclusiveGroup = subparser.addMutuallyExclusiveGroup();
+        mutuallyExclusiveGroup.addArgument("-g", "--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")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("-e", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());


@@ -50,40 +43,43 @@ public class SendCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {

-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+        final List<String> recipients = ns.getList("recipient");
+        final var isEndSession = ns.getBoolean("endsession");
+        final var groupIdString = ns.getString("group");
+        final var isNoteToSelf = ns.getBoolean("note_to_self");

 
 

-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (ns.getBoolean("endsession") || ns.getString("group") == null)) {
+        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;
         }
             System.err.println("No recipients given");
             System.err.println("Aborting sending.");
             return 1;
         }

+        if (!noRecipients && groupIdString != null) {
+            System.err.println("You cannot specify recipients by phone number and groups at the same time");
+            return 1;
+        }
+        if (!noRecipients && isNoteToSelf) {
+            System.err.println("You cannot specify recipients by phone number and not to self at the same time");
+            return 1;
+        }

 
 

-        if (ns.getBoolean("endsession")) {
+        if (isEndSession) {

             try {
             try {

-                signal.sendEndSessionMessage(ns.getList("recipient"));
+                signal.sendEndSessionMessage(recipients);

                 return 0;
                 return 0;

-            } catch (IOException e) {
-                handleIOException(e);
-                return 3;
-            } catch (EncapsulatedExceptions e) {
-                handleEncapsulatedExceptions(e);
-                return 3;

             } catch (AssertionError e) {
                 handleAssertionError(e);
                 return 1;
             } catch (AssertionError e) {
                 handleAssertionError(e);
                 return 1;

+            } catch (Signal.Error.UntrustedIdentity e) {
+                System.err.println("Failed to send message: " + e.getMessage());
+                return 4;

             } catch (DBusExecutionException e) {
             } catch (DBusExecutionException e) {

-                handleDBusExecutionException(e);
-                return 1;
-            } catch (InvalidNumberException e) {
-                handleInvalidNumberException(e);
-                return 1;
+                System.err.println("Failed to send message: " + e.getMessage());
+                return 2;

             }
         }
 
             }
         }
 

-        String messageText = ns.getString("message");
+        var messageText = ns.getString("message");

         if (messageText == null) {
             try {
                 messageText = IOUtils.readAll(System.in, Charset.defaultCharset());
         if (messageText == null) {
             try {
                 messageText = IOUtils.readAll(System.in, Charset.defaultCharset());


@@ -94,48 +90,77 @@ public class SendCommand implements DbusCommand {
             }
         }
 
             }
         }
 

-        try {
-            List<String> attachments = ns.getList("attachment");
-            if (attachments == null) {
-                attachments = new ArrayList<>();
+        List<String> attachments = ns.getList("attachment");
+        if (attachments == null) {
+            attachments = List.of();
+        }
+
+        final var writer = new PlainTextWriterImpl(System.out);
+
+        if (groupIdString != null) {
+            byte[] groupId;
+            try {
+                groupId = Util.decodeGroupId(groupIdString).serialize();
+            } catch (GroupIdFormatException e) {
+                handleGroupIdFormatException(e);
+                return 1;
+            }
+
+            try {
+                var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
+                writer.println("{}", timestamp);
+                return 0;
+            } catch (AssertionError e) {
+                handleAssertionError(e);
+                return 1;
+            } catch (DBusExecutionException e) {
+                System.err.println("Failed to send group message: " + e.getMessage());
+                return 2;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return 3;

             }
             }

-            long timestamp;
-            if (ns.getString("group") != null) {
-                byte[] groupId = Util.decodeGroupId(ns.getString("group"));
-                timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
-            } else {
-                timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
+        }
+
+        if (isNoteToSelf) {
+            try {
+                var timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
+                writer.println("{}", timestamp);
+                return 0;
+            } catch (AssertionError e) {
+                handleAssertionError(e);
+                return 1;
+            } catch (Signal.Error.UntrustedIdentity e) {
+                System.err.println("Failed to send message: " + e.getMessage());
+                return 4;
+            } catch (DBusExecutionException e) {
+                System.err.println("Failed to send note to self message: " + e.getMessage());
+                return 2;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return 3;

             }
             }

-            System.out.println(timestamp);
+        }
+
+        try {
+            var timestamp = signal.sendMessage(messageText, attachments, recipients);
+            writer.println("{}", timestamp);

             return 0;
             return 0;

-        } catch (IOException e) {
-            handleIOException(e);
-            return 3;
-        } catch (EncapsulatedExceptions e) {
-            handleEncapsulatedExceptions(e);
-            return 3;

         } catch (AssertionError e) {
             handleAssertionError(e);
             return 1;
         } catch (AssertionError e) {
             handleAssertionError(e);
             return 1;

-        } catch (GroupNotFoundException e) {
-            handleGroupNotFoundException(e);
-            return 1;
-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (AttachmentInvalidException e) {
-            System.err.println("Failed to add attachment: " + e.getMessage());
-            System.err.println("Aborting sending.");
+        } catch (UnknownObject e) {
+            System.err.println("Failed to find dbus object, maybe missing the -u flag: " + e.getMessage());

             return 1;
             return 1;

+        } catch (Signal.Error.UntrustedIdentity e) {
+            System.err.println("Failed to send message: " + e.getMessage());
+            return 4;

         } catch (DBusExecutionException e) {
         } catch (DBusExecutionException e) {

-            handleDBusExecutionException(e);
-            return 1;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
-            return 1;
-        } catch (InvalidNumberException e) {
-            handleInvalidNumberException(e);
-            return 1;
+            System.err.println("Failed to send message: " + e.getMessage());
+            return 2;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return 3;

         }
     }
 }
         }
     }
 }