Use PlainTextWriter for all cli stdout output

[signal-cli] / 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 e9ddc1f0dbd59e46e6b7e1d1659d86b0abfa51c3..bcae9d41d4291176def5818c393b8bbc2fda25ef 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -4,8 +4,8 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

+import org.asamk.signal.PlainTextWriterImpl;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.groups.GroupId;

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;


@@ -48,9 +48,9 @@ public class SendReactionCommand implements LocalCommand {
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
         final List<String> recipients = ns.getList("recipient");
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
         final List<String> recipients = ns.getList("recipient");

-        final String groupIdString = ns.getString("group");
+        final var groupIdString = ns.getString("group");

 
 

-        final boolean noRecipients = recipients == null || recipients.isEmpty();
+        final var noRecipients = recipients == null || recipients.isEmpty();

         if (noRecipients && groupIdString == null) {
             System.err.println("No recipients given");
             System.err.println("Aborting sending.");
         if (noRecipients && groupIdString == null) {
             System.err.println("No recipients given");
             System.err.println("Aborting sending.");


@@ -61,20 +61,22 @@ public class SendReactionCommand implements LocalCommand {
             return 1;
         }
 
             return 1;
         }
 

-        final String emoji = ns.getString("emoji");
+        final var emoji = ns.getString("emoji");

         final boolean isRemove = ns.getBoolean("remove");
         final boolean isRemove = ns.getBoolean("remove");

-        final String targetAuthor = ns.getString("target_author");
+        final var targetAuthor = ns.getString("target_author");

         final long targetTimestamp = ns.getLong("target_timestamp");
 
         try {
         final long targetTimestamp = ns.getLong("target_timestamp");
 
         try {

+            final var writer = new PlainTextWriterImpl(System.out);
+

             final Pair<Long, List<SendMessageResult>> results;
             if (groupIdString != null) {
             final Pair<Long, List<SendMessageResult>> results;
             if (groupIdString != null) {

-                GroupId groupId = Util.decodeGroupId(groupIdString);
+                var groupId = Util.decodeGroupId(groupIdString);

                 results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
                 results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }
                 results = m.sendGroupMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, groupId);
             } else {
                 results = m.sendMessageReaction(emoji, isRemove, targetAuthor, targetTimestamp, recipients);
             }

-            return handleTimestampAndSendMessageResults(results.first(), results.second());
+            return handleTimestampAndSendMessageResults(writer, results.first(), results.second());

         } catch (IOException e) {
             handleIOException(e);
             return 3;
         } catch (IOException e) {
             handleIOException(e);
             return 3;