X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/af292d8f0ea897ea13470489d51c40acca50fc3e..a7db3a5610db2cf718030fbe06e5ebb8531459c8:/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 462ba8d2..7ff91e9b 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -3,13 +3,14 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 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.whispersystems.signalservice.api.util.InvalidNumberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 
@@ -23,8 +24,10 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the details of a given contact");
-        subparser.addArgument("number").help("Contact number");
+        subparser.addArgument("recipient").help("Contact number");
         subparser.addArgument("-n", "--name").help("New contact name");
+        subparser.addArgument("--given-name").help("New contact given name");
+        subparser.addArgument("--family-name").help("New contact family name");
         subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
@@ -32,24 +35,32 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        var number = ns.getString("number");
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
 
         try {
             var expiration = ns.getInt("expiration");
             if (expiration != null) {
-                m.setExpirationTimer(number, expiration);
+                m.setExpirationTimer(recipient, expiration);
             }
 
-            var name = ns.getString("name");
-            if (name != null) {
-                m.setContactName(number, name);
+            var givenName = ns.getString("given-name");
+            var familyName = ns.getString("family-name");
+            if (givenName == null) {
+                givenName = ns.getString("name");
+                if (givenName != null && familyName == null) {
+                    familyName = "";
+                }
+            }
+            if (givenName != null || familyName != null) {
+                m.setContactName(recipient, givenName, familyName);
             }
-        } catch (InvalidNumberException e) {
-            throw new UserErrorException("Invalid contact number: " + e.getMessage());
         } catch (IOException e) {
-            throw new IOErrorException("Update contact error: " + e.getMessage());
-        } catch (NotMasterDeviceException e) {
+            throw new IOErrorException("Update contact error: " + e.getMessage(), e);
+        } catch (NotPrimaryDeviceException 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.");
         }
     }
 }