Handle send failures as non fatal and return detailed results in json output

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

diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index f55981e3dfce919a4d7d5431e2da9a13b78bc15c..4a2a038ca00b835b583c558eb56f7e96a20c2c72 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -12,15 +12,13 @@ import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
-import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.ErrorUtils;
 
 import java.io.IOException;
 import java.util.HashSet;
-import java.util.Map;
+
+import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendTypingCommand implements JsonRpcLocalCommand {
 
@@ -61,8 +59,7 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
 
         try {
             final var results = m.sendTypingMessage(action, recipientIdentifiers);
-            outputResult(outputWriter, results.timestamp());
-            ErrorUtils.handleSendMessageResults(results.results());
+            outputResult(outputWriter, results);
         } catch (IOException e) {
             throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
                     .getSimpleName() + ")");
@@ -70,13 +67,4 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
             throw new UserErrorException("Failed to send to group: " + e.getMessage());
         }
     }
-
-    private void outputResult(final OutputWriter outputWriter, final long timestamp) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            writer.println("{}", timestamp);
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            writer.write(Map.of("timestamp", timestamp));
-        }
-    }
 }