X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/467a48bac508b56f84dce7ee0b81a22fd0d32161..c88c92086efcf5c0ad417589db997ef1a034e775:/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 22dcc5d8..618655be 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -4,10 +4,11 @@ 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;
 
@@ -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,10 +38,15 @@ public class TrustCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        var recipentString = ns.getString("number");
-        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getUsername());
-        if (ns.getBoolean("trust-all-known-keys")) {
-            boolean res = m.trustIdentityAllKeys(recipient);
+        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(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.");
             }
@@ -60,13 +66,23 @@ public class TrustCommand implements JsonRpcLocalCommand {
                     throw new UserErrorException(
                             "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
                 }
-                boolean res = m.trustIdentityVerified(recipient, fingerprintBytes);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerified(recipient, fingerprintBytes);
+                } 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 the fingerprint of this number, make sure the number and the fingerprint are correct.");
                 }
             } else if (safetyNumber.length() == 60) {
-                boolean res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
+                } 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 the safety number of this phone number, make sure the phone number and the safety number are correct.");
@@ -79,7 +95,12 @@ public class TrustCommand implements JsonRpcLocalCommand {
                     throw new UserErrorException(
                             "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
                 }
-                boolean res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+                boolean res;
+                try {
+                    res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
+                } 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 the safety number of this phone number, make sure the phone number and the safety number are correct.");