X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/4f67ac674b464b07a9ce022a6b19229d511384e2..f207c2abc390d1b6292de6e86379d1513dc358cf:/src/main/java/org/asamk/signal/commands/TrustCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 65487ba7..618655be 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,12 +4,13 @@ import net.sourceforge.argparse4j.impl.Arguments;
 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.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.Hex;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.util.Base64;
 import java.util.Locale;
@@ -24,7 +25,7 @@ public class TrustCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Set the trust level of a given number.");
-        subparser.addArgument("number").help("Specify the phone number, for which to set the trust.").required(true);
+        subparser.addArgument("recipient").help("Specify the phone number, for which to set the trust.").required(true);
         var mutTrust = subparser.addMutuallyExclusiveGroup();
         mutTrust.addArgument("-a", "--trust-all-known-keys")
                 .help("Trust all known keys of this user, only use this for testing.")
@@ -37,13 +38,14 @@ public class TrustCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        var number = ns.getString("number");
-        if (ns.getBoolean("trust-all-known-keys")) {
+        var recipentString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
+        if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
             boolean res;
             try {
-                res = m.trustIdentityAllKeys(number);
-            } catch (InvalidNumberException e) {
-                throw new UserErrorException("Failed to parse recipient: " + e.getMessage());
+                res = m.trustIdentityAllKeys(recipient);
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
             if (!res) {
                 throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
@@ -66,9 +68,9 @@ public class TrustCommand implements JsonRpcLocalCommand {
                 }
                 boolean res;
                 try {
-                    res = m.trustIdentityVerified(number, fingerprintBytes);
-                } catch (InvalidNumberException e) {
-                    throw new UserErrorException("Failed to parse recipient: " + e.getMessage());
+                    res = m.trustIdentityVerified(recipient, fingerprintBytes);
+                } catch (UnregisteredRecipientException e) {
+                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
                 }
                 if (!res) {
                     throw new UserErrorException(
@@ -77,9 +79,9 @@ public class TrustCommand implements JsonRpcLocalCommand {
             } else if (safetyNumber.length() == 60) {
                 boolean res;
                 try {
-                    res = m.trustIdentityVerifiedSafetyNumber(number, safetyNumber);
-                } catch (InvalidNumberException e) {
-                    throw new UserErrorException("Failed to parse recipient: " + e.getMessage());
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
+                } catch (UnregisteredRecipientException e) {
+                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
                 }
                 if (!res) {
                     throw new UserErrorException(
@@ -95,9 +97,9 @@ public class TrustCommand implements JsonRpcLocalCommand {
                 }
                 boolean res;
                 try {
-                    res = m.trustIdentityVerifiedSafetyNumber(number, scannableSafetyNumber);
-                } catch (InvalidNumberException e) {
-                    throw new UserErrorException("Failed to parse recipient: " + e.getMessage());
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+                } catch (UnregisteredRecipientException e) {
+                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
                 }
                 if (!res) {
                     throw new UserErrorException(