Improve error handling of getUserStatus command for invalid phonen numbers

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index e1afca6948f6bb69b9e95afcf1cd3b37825efcc2..d951ece984327f4dbaaf51f74ce0e9ba65d2f759 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,32 +3,55 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.NotMasterDeviceException;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
 
-public class UpdateContactCommand implements LocalCommand {
+import java.io.IOException;
+
+public class UpdateContactCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "updateContact";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("number")
-                .help("Contact number");
-        subparser.addArgument("-n", "--name")
-                .required(true)
-                .help("New contact name");
         subparser.help("Update the details of a given contact");
+        subparser.addArgument("recipient").help("Contact number");
+        subparser.addArgument("-n", "--name").help("New contact name");
+        subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
+
+        try {
+            var expiration = ns.getInt("expiration");
+            if (expiration != null) {
+                m.setExpirationTimer(recipient, expiration);
+            }
+
+            var name = ns.getString("name");
+            if (name != null) {
+                m.setContactName(recipient, name);
+            }
+        } catch (IOException e) {
+            throw new IOErrorException("Update contact error: " + e.getMessage(), e);
+        } catch (NotMasterDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
         }
-
-        String number = ns.getString("number");
-        String name = ns.getString("name");
-
-        m.setContactName(number, name);
-
-        return 0;
     }
 }