X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/fea19c9e20ed07228420dae93399911a659e51b1..15c9d047033f2dd64a677aca8139a3ecd34e9472:/client/src/cli.rs

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 23d9e914..dea3a7df 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -1,24 +1,26 @@
-use clap::{crate_version, Parser, Subcommand, ValueEnum};
 use std::{ffi::OsString, net::SocketAddr};
 
+use clap::{crate_version, Parser, Subcommand, ValueEnum};
+
 /// JSON-RPC client for signal-cli
 #[derive(Parser, Debug)]
-#[command(rename_all = "kebab-case", version=crate_version!())]
+#[command(rename_all = "kebab-case", version = crate_version!())]
 pub struct Cli {
     /// Account to use (for daemon in multi-account mode)
     #[arg(short = 'a', long)]
     pub account: Option<String>,
 
     /// TCP host and port of signal-cli daemon
-    #[arg(long)]
+    #[arg(long, conflicts_with = "json_rpc_http")]
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon
-    #[arg(long)]
+    #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 
-    #[arg(value_enum, long, default_value_t = OutputTypes::Json)]
-    pub output: OutputTypes,
+    /// HTTP URL of signal-cli daemon
+    #[arg(long, conflicts_with = "json_rpc_socket")]
+    pub json_rpc_http: Option<Option<String>>,
 
     #[arg(long)]
     pub verbose: bool,
@@ -27,21 +29,18 @@ pub struct Cli {
     pub command: CliCommands,
 }
 
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum OutputTypes {
-    PlainText,
-    Json,
-}
-
 #[allow(clippy::large_enum_variant)]
 #[derive(Subcommand, Debug)]
-#[command(rename_all = "camelCase", version=crate_version!())]
+#[command(rename_all = "camelCase", version = crate_version!())]
 pub enum CliCommands {
     AddDevice {
         #[arg(long)]
         uri: String,
     },
+    AddStickerPack {
+        #[arg(long)]
+        uri: String,
+    },
     #[command(rename_all = "kebab-case")]
     Block {
         recipient: Vec<String>,
@@ -53,6 +52,22 @@ pub enum CliCommands {
         #[arg(long = "ignore-registered")]
         ignore_registered: Option<bool>,
     },
+    FinishChangeNumber {
+        number: String,
+        #[arg(short = 'v', long = "verification-code")]
+        verification_code: String,
+
+        #[arg(short = 'p', long)]
+        pin: Option<String>,
+    },
+    GetAttachment {
+        #[arg(long)]
+        id: String,
+        #[arg(long)]
+        recipient: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
     GetUserStatus {
         recipient: Vec<String>,
     },
@@ -108,6 +123,8 @@ pub enum CliCommands {
         recipient: String,
         #[arg(long)]
         forget: bool,
+        #[arg(long)]
+        hide: bool,
     },
     RemoveDevice {
         #[arg(short = 'd', long = "device-id")]
@@ -148,6 +165,9 @@ pub enum CliCommands {
         #[arg(long)]
         mention: Vec<String>,
 
+        #[arg(long)]
+        text_style: Vec<String>,
+
         #[arg(long)]
         quote_timestamp: Option<u64>,
 
@@ -160,8 +180,35 @@ pub enum CliCommands {
         #[arg(long)]
         quote_mention: Vec<String>,
 
+        #[arg(long)]
+        quote_text_style: Vec<String>,
+
+        #[arg(long)]
+        quote_attachment: Vec<String>,
+
+        #[arg(long)]
+        preview_url: Option<String>,
+
+        #[arg(long)]
+        preview_title: Option<String>,
+
+        #[arg(long)]
+        preview_description: Option<String>,
+
+        #[arg(long)]
+        preview_image: Option<String>,
+
         #[arg(long)]
         sticker: Option<String>,
+
+        #[arg(long)]
+        story_timestamp: Option<u64>,
+
+        #[arg(long)]
+        story_author: Option<String>,
+
+        #[arg(long)]
+        edit_timestamp: Option<u64>,
     },
     SendContacts,
     SendPaymentNotification {
@@ -219,6 +266,13 @@ pub enum CliCommands {
     SetPin {
         pin: String,
     },
+    StartChangeNumber {
+        number: String,
+        #[arg(short = 'v', long)]
+        voice: bool,
+        #[arg(long)]
+        captcha: Option<String>,
+    },
     SubmitRateLimitChallenge {
         challenge: String,
         captcha: String,
@@ -246,6 +300,8 @@ pub enum CliCommands {
     UpdateAccount {
         #[arg(short = 'n', long = "device-name")]
         device_name: Option<String>,
+        #[arg(long = "unrestricted-unidentified-sender")]
+        unrestricted_unidentified_sender: Option<bool>,
     },
     UpdateConfiguration {
         #[arg(long = "read-receipts")]