From b31e97dd2d344dc1d5cf928ed6bdb978cff1faa4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 16 Jan 2021 10:21:38 +0100
Subject: [PATCH] Move recipients/group argument check to send commands

---
 src/main/java/org/asamk/signal/Main.java      |  5 ----
 .../asamk/signal/commands/SendCommand.java    | 23 +++++++++------
 .../signal/commands/SendReactionCommand.java  | 28 +++++++++++--------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index ddcf47e1..45945c02 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -93,11 +93,6 @@ public class Main {
             return null;
         }
 
-        if (ns.getList("recipient") != null && !ns.getList("recipient").isEmpty() && ns.getString("group") != null) {
-            System.err.println("You cannot specify recipients by phone number and groups at the same time");
-            System.exit(2);
-        }
-
         return ns;
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 235fc53c..d3717aa2 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -34,17 +34,24 @@ public class SendCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (
-                ns.getBoolean("endsession") || ns.getString("group") == null
-        )) {
+        final List<String> recipients = ns.getList("recipient");
+        final Boolean isEndSession = ns.getBoolean("endsession");
+        final String groupIdString = ns.getString("group");
+
+        final boolean noRecipients = recipients == null || recipients.isEmpty();
+        if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null)) {
             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 (ns.getBoolean("endsession")) {
+        if (isEndSession) {
             try {
-                signal.sendEndSessionMessage(ns.getList("recipient"));
+                signal.sendEndSessionMessage(recipients);
                 return 0;
             } catch (AssertionError e) {
                 handleAssertionError(e);
@@ -72,10 +79,10 @@ public class SendCommand implements DbusCommand {
         }
 
         try {
-            if (ns.getString("group") != null) {
+            if (groupIdString != null) {
                 byte[] groupId;
                 try {
-                    groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+                    groupId = Util.decodeGroupId(groupIdString).serialize();
                 } catch (GroupIdFormatException e) {
                     handleGroupIdFormatException(e);
                     return 1;
@@ -94,7 +101,7 @@ public class SendCommand implements DbusCommand {
         }
 
         try {
-            long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
+            long timestamp = signal.sendMessage(messageText, attachments, recipients);
             System.out.println(timestamp);
             return 0;
         } catch (AssertionError e) {
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 2a9afa74..e9ddc1f0 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -47,28 +47,32 @@ 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) {
+        final List<String> recipients = ns.getList("recipient");
+        final String groupIdString = ns.getString("group");
+
+        final boolean noRecipients = recipients == null || recipients.isEmpty();
+        if (noRecipients && groupIdString == null) {
             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;
+        }
 
-        String emoji = ns.getString("emoji");
-        boolean isRemove = ns.getBoolean("remove");
-        String targetAuthor = ns.getString("target_author");
-        long targetTimestamp = ns.getLong("target_timestamp");
+        final String emoji = ns.getString("emoji");
+        final boolean isRemove = ns.getBoolean("remove");
+        final String targetAuthor = ns.getString("target_author");
+        final long targetTimestamp = ns.getLong("target_timestamp");
 
         try {
             final Pair<Long, List<SendMessageResult>> results;
-            if (ns.getString("group") != null) {
-                GroupId groupId = Util.decodeGroupId(ns.getString("group"));
+            if (groupIdString != null) {
+                GroupId groupId = Util.decodeGroupId(groupIdString);
                 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());
         } catch (IOException e) {
-- 
2.50.1