Add support for sending view once messages

[signal-cli] / client / src / cli.rs

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 0b513268eabd9a8e4d0739485b0442092df33d97..7fa5d1c5987aae15d62f9df66b27eb714d052411 100644 (file)
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -1,9 +1,10 @@
-use clap::{crate_version, Parser, Subcommand, ValueEnum};

 use std::{ffi::OsString, net::SocketAddr};
 
 use std::{ffi::OsString, net::SocketAddr};
 

+use clap::{crate_version, Parser, Subcommand, ValueEnum};
+

 /// JSON-RPC client for signal-cli
 #[derive(Parser, Debug)]
 /// 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 struct Cli {
     /// Account to use (for daemon in multi-account mode)
     #[arg(short = 'a', long)]


@@ -14,6 +15,7 @@ pub struct Cli {
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon

+    #[cfg(unix)]

     #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 
     #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 


@@ -21,9 +23,6 @@ pub struct Cli {
     #[arg(long, conflicts_with = "json_rpc_socket")]
     pub json_rpc_http: Option<Option<String>>,
 
     #[arg(long, conflicts_with = "json_rpc_socket")]
     pub json_rpc_http: Option<Option<String>>,
 

-    #[arg(value_enum, long, default_value_t = OutputTypes::Json)]
-    pub output: OutputTypes,
-

     #[arg(long)]
     pub verbose: bool,
 
     #[arg(long)]
     pub verbose: bool,
 


@@ -31,21 +30,18 @@ pub struct Cli {
     pub command: CliCommands,
 }
 
     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)]
 #[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,
     },
 pub enum CliCommands {
     AddDevice {
         #[arg(long)]
         uri: String,
     },

+    AddStickerPack {
+        #[arg(long)]
+        uri: String,
+    },

     #[command(rename_all = "kebab-case")]
     Block {
         recipient: Vec<String>,
     #[command(rename_all = "kebab-case")]
     Block {
         recipient: Vec<String>,


@@ -57,8 +53,40 @@ pub enum CliCommands {
         #[arg(long = "ignore-registered")]
         ignore_registered: Option<bool>,
     },
         #[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>,
+    },
+    GetAvatar {
+        #[arg(long)]
+        contact: Option<String>,
+        #[arg(long)]
+        profile: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
+    GetSticker {
+        #[arg(long = "pack-id")]
+        pack_id: String,
+        #[arg(long = "sticker-id")]
+        sticker_id: u32,
+    },

     GetUserStatus {
         recipient: Vec<String>,
     GetUserStatus {
         recipient: Vec<String>,

+        #[arg(long)]
+        username: Vec<String>,

     },
     JoinGroup {
         #[arg(long)]
     },
     JoinGroup {
         #[arg(long)]


@@ -112,6 +140,8 @@ pub enum CliCommands {
         recipient: String,
         #[arg(long)]
         forget: bool,
         recipient: String,
         #[arg(long)]
         forget: bool,

+        #[arg(long)]
+        hide: bool,

     },
     RemoveDevice {
         #[arg(short = 'd', long = "device-id")]
     },
     RemoveDevice {
         #[arg(short = 'd', long = "device-id")]


@@ -149,9 +179,15 @@ pub enum CliCommands {
         #[arg(short = 'a', long)]
         attachment: Vec<String>,
 
         #[arg(short = 'a', long)]
         attachment: Vec<String>,
 

+        #[arg(long)]
+        view_once: bool,
+

         #[arg(long)]
         mention: Vec<String>,
 
         #[arg(long)]
         mention: Vec<String>,
 

+        #[arg(long)]
+        text_style: Vec<String>,
+

         #[arg(long)]
         quote_timestamp: Option<u64>,
 
         #[arg(long)]
         quote_timestamp: Option<u64>,
 


@@ -164,9 +200,24 @@ pub enum CliCommands {
         #[arg(long)]
         quote_mention: Vec<String>,
 
         #[arg(long)]
         quote_mention: Vec<String>,
 

+        #[arg(long)]
+        quote_text_style: Vec<String>,
+

         #[arg(long)]
         quote_attachment: 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)]
         sticker: Option<String>,
 


@@ -175,6 +226,9 @@ pub enum CliCommands {
 
         #[arg(long)]
         story_author: Option<String>,
 
         #[arg(long)]
         story_author: Option<String>,

+
+        #[arg(long)]
+        edit_timestamp: Option<u64>,

     },
     SendContacts,
     SendPaymentNotification {
     },
     SendContacts,
     SendPaymentNotification {


@@ -229,9 +283,24 @@ pub enum CliCommands {
         #[arg(short = 's', long)]
         stop: bool,
     },
         #[arg(short = 's', long)]
         stop: bool,
     },

+    SendMessageRequestResponse {
+        recipient: Vec<String>,
+
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Vec<String>,
+
+        r#type: MessageRequestResponseType,
+    },

     SetPin {
         pin: String,
     },
     SetPin {
         pin: String,
     },

+    StartChangeNumber {
+        number: String,
+        #[arg(short = 'v', long)]
+        voice: bool,
+        #[arg(long)]
+        captcha: Option<String>,
+    },

     SubmitRateLimitChallenge {
         challenge: String,
         captcha: String,
     SubmitRateLimitChallenge {
         challenge: String,
         captcha: String,


@@ -259,6 +328,12 @@ pub enum CliCommands {
     UpdateAccount {
         #[arg(short = 'n', long = "device-name")]
         device_name: Option<String>,
     UpdateAccount {
         #[arg(short = 'n', long = "device-name")]
         device_name: Option<String>,

+        #[arg(long = "unrestricted-unidentified-sender")]
+        unrestricted_unidentified_sender: Option<bool>,
+        #[arg(long = "discoverable-by-number")]
+        discoverable_by_number: Option<bool>,
+        #[arg(long = "number-sharing")]
+        number_sharing: Option<bool>,

     },
     UpdateConfiguration {
         #[arg(long = "read-receipts")]
     },
     UpdateConfiguration {
         #[arg(long = "read-receipts")]


@@ -344,7 +419,7 @@ pub enum CliCommands {
         #[arg(long = "about-emoji")]
         about_emoji: Option<String>,
 
         #[arg(long = "about-emoji")]
         about_emoji: Option<String>,
 

-        #[arg(long = "mobile-coin-address")]
+        #[arg(long = "mobile-coin-address", visible_alias = "mobilecoin-address")]

         mobile_coin_address: Option<String>,
 
         #[arg(long)]
         mobile_coin_address: Option<String>,
 
         #[arg(long)]


@@ -386,3 +461,10 @@ pub enum GroupPermission {
     EveryMember,
     OnlyAdmins,
 }
     EveryMember,
     OnlyAdmins,
 }

+
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
+pub enum MessageRequestResponseType {
+    Accept,
+    Delete,
+}