Switch to jsonrpsee

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

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 0191000113066c6b95347d9d99144bc680d4f9f1..6a8dd3613dedaad0cb8f571884b37548700f32a0 100644 (file)
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -10,13 +10,17 @@ pub struct Cli {
     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>>,
 
+    /// HTTP URL of signal-cli daemon
+    #[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,
 
@@ -162,6 +166,12 @@ pub enum CliCommands {
 
         #[arg(long)]
         sticker: Option<String>,
+
+        #[arg(long)]
+        story_timestamp: Option<u64>,
+
+        #[arg(long)]
+        story_author: Option<String>,
     },
     SendContacts,
     SendPaymentNotification {
@@ -193,6 +203,9 @@ pub enum CliCommands {
 
         #[arg(short = 'r', long)]
         remove: bool,
+
+        #[arg(long)]
+        story: bool,
     },
     SendReceipt {
         recipient: String,