From: AsamK Date: Wed, 25 Aug 2021 19:21:12 +0000 (+0200) Subject: Align cli param names for recipient X-Git-Tag: v0.9.0~44 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/95792be9bcc1068c470630c13e0aebc55ed3bdc7 Align cli param names for recipient --- diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java index 7326c398..105c2016 100644 --- a/src/main/java/org/asamk/signal/commands/BlockCommand.java +++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java @@ -25,7 +25,7 @@ public class BlockCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Block the given contacts or groups (no messages will be received)"); - subparser.addArgument("contact").help("Contact number").nargs("*"); + subparser.addArgument("recipient").help("Contact number").nargs("*"); subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*"); } @@ -33,7 +33,7 @@ public class BlockCommand implements JsonRpcLocalCommand { public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - final var contacts = ns.getList("contact"); + final var contacts = ns.getList("recipient"); for (var contact : CommandUtil.getSingleRecipientIdentifiers(contacts, m.getUsername())) { try { m.setContactBlocked(contact, true); diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java index 055dac9f..cf4be085 100644 --- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java +++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java @@ -31,7 +31,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Check if the specified phone number/s have been registered"); - subparser.addArgument("number").help("Phone number").nargs("+"); + subparser.addArgument("recipient").help("Phone number").nargs("+"); } @Override @@ -41,7 +41,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand { // Get a map of registration statuses Map> registered; try { - registered = m.areUsersRegistered(new HashSet<>(ns.getList("number"))); + registered = m.areUsersRegistered(new HashSet<>(ns.getList("recipient"))); } catch (IOException e) { logger.debug("Failed to check registered users", e); throw new IOErrorException("Unable to check if users are registered"); @@ -69,7 +69,7 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand { private static final class JsonUserStatus { - public final String name; + public final String recipient; public final String number; @@ -77,8 +77,8 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand { public final boolean isRegistered; - public JsonUserStatus(String name, String number, String uuid, boolean isRegistered) { - this.name = name; + public JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) { + this.recipient = recipient; this.number = number; this.uuid = uuid; this.isRegistered = isRegistered; diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java index afdbd4f8..70e2f015 100644 --- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java @@ -27,7 +27,9 @@ public class SendReceiptCommand implements JsonRpcLocalCommand { .type(long.class) .nargs("+") .help("Specify the timestamp of the messages for which a receipt should be sent."); - subparser.addArgument("--type").help("Specify the receipt type.").choices("read", "viewed").setDefault("read"); + subparser.addArgument("--type") + .help("Specify the receipt type (default is read receipt).") + .choices("read", "viewed"); } @Override @@ -41,7 +43,7 @@ public class SendReceiptCommand implements JsonRpcLocalCommand { final var type = ns.getString("type"); try { - if ("read".equals(type)) { + if (type == null || "read".equals(type)) { m.sendReadReceipt(recipient, targetTimestamps); } else if ("viewed".equals(type)) { m.sendViewedReceipt(recipient, targetTimestamps); diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java index 22dcc5d8..aedc2c3e 100644 --- a/src/main/java/org/asamk/signal/commands/TrustCommand.java +++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java @@ -24,7 +24,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,7 +37,7 @@ 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 recipentString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getUsername()); if (ns.getBoolean("trust-all-known-keys")) { boolean res = m.trustIdentityAllKeys(recipient); diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java index c5b9d1ca..e931a60e 100644 --- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java @@ -25,7 +25,7 @@ public class UnblockCommand implements JsonRpcLocalCommand { @Override public void attachToSubparser(final Subparser subparser) { subparser.help("Unblock the given contacts or groups (messages will be received again)"); - subparser.addArgument("contact").help("Contact number").nargs("*"); + subparser.addArgument("recipient").help("Contact number").nargs("*"); subparser.addArgument("-g", "--group-id", "--group").help("Group ID").nargs("*"); } @@ -33,7 +33,7 @@ public class UnblockCommand implements JsonRpcLocalCommand { public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - for (var contactNumber : CommandUtil.getSingleRecipientIdentifiers(ns.getList("contact"), m.getUsername())) { + for (var contactNumber : CommandUtil.getSingleRecipientIdentifiers(ns.getList("recipient"), m.getUsername())) { try { m.setContactBlocked(contactNumber, false); } catch (NotMasterDeviceException e) { diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java index 2b7d5b4b..8b9f9aa5 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java @@ -23,7 +23,7 @@ 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("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)"); } @@ -32,7 +32,7 @@ public class UpdateContactCommand implements JsonRpcLocalCommand { public void handleCommand( final Namespace ns, final Manager m, final OutputWriter outputWriter ) throws CommandException { - var recipientString = ns.getString("number"); + var recipientString = ns.getString("recipient"); var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getUsername()); try {