From c6d63f0b5c231bfc42128a670923a660fabd1835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 7 Jun 2021 17:58:06 +0200 Subject: default send message to current channel if no channel specified --- mumctl/src/main.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index bde24a1..7d02582 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -381,10 +381,14 @@ fn match_opt() -> Result<(), Error> { } => { let msg = MumCommand::SendMessage { message, - targets: names - .into_iter() - .map(|name| MessageTarget::Channel { name, recursive }) - .collect(), + targets: if !names.is_empty() { + names + .into_iter() + .map(|name| MessageTarget::Channel { name, recursive }) + .collect() + } else { + vec![MessageTarget::CurrentChannel { recursive }] + }, }; send_command(msg)??; } -- cgit v1.2.1 From 01e996ce32e13bd47be938dcb8db83778658b3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 7 Jun 2021 17:59:18 +0200 Subject: send message documentation --- mumctl/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 7d02582..d1d0a62 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -94,10 +94,10 @@ enum Target { Channel { /// The message to send message: String, - /// If the message should be sent recursivley to sub-channels + /// If the message should be sent recursively to sub-channels #[structopt(short = "r", long = "recursive")] recursive: bool, - /// Which channels to send to + /// Which channels to send to. Defaults to current channel if left empty names: Vec, }, User { -- cgit v1.2.1 From 4aff5b39b0ca6e0594870e7545f720de8427392e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 11 Jun 2021 03:03:39 +0200 Subject: invert if --- mumctl/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index d1d0a62..9d87541 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -381,13 +381,13 @@ fn match_opt() -> Result<(), Error> { } => { let msg = MumCommand::SendMessage { message, - targets: if !names.is_empty() { + targets: if names.is_empty() { + vec![MessageTarget::CurrentChannel { recursive }] + } else { names .into_iter() .map(|name| MessageTarget::Channel { name, recursive }) .collect() - } else { - vec![MessageTarget::CurrentChannel { recursive }] }, }; send_command(msg)??; -- cgit v1.2.1 From b5805f7e72afcc53287b0e5ff52f131f99849784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 11 Jun 2021 03:21:27 +0200 Subject: clearer api for message targets --- mumctl/src/main.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 9d87541..99e0608 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -1,6 +1,6 @@ use colored::Colorize; use log::*; -use mumlib::command::{Command as MumCommand, CommandResponse, MessageTarget}; +use mumlib::command::{ChannelTarget, Command as MumCommand, CommandResponse, MessageTarget}; use mumlib::config::{self, Config, ServerConfig}; use mumlib::state::Channel as MumChannel; use serde::de::DeserializeOwned; @@ -381,13 +381,15 @@ fn match_opt() -> Result<(), Error> { } => { let msg = MumCommand::SendMessage { message, - targets: if names.is_empty() { - vec![MessageTarget::CurrentChannel { recursive }] + target: if names.is_empty() { + MessageTarget::Channel(vec![(ChannelTarget::Default, recursive)]) } else { - names - .into_iter() - .map(|name| MessageTarget::Channel { name, recursive }) - .collect() + MessageTarget::Channel( + names + .into_iter() + .map(|name| (ChannelTarget::Named(name), recursive)) + .collect() + ) }, }; send_command(msg)??; @@ -395,10 +397,7 @@ fn match_opt() -> Result<(), Error> { Target::User { message, names } => { let msg = MumCommand::SendMessage { message, - targets: names - .into_iter() - .map(|name| MessageTarget::User { name }) - .collect(), + target: MessageTarget::User(names), }; send_command(msg)??; } -- cgit v1.2.1 From 3cfbfe7aab14e9a33c7d4e81289de40a60f19eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 11 Jun 2021 17:21:57 +0200 Subject: doc {Message,Channel}Target --- mumctl/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mumctl/src') diff --git a/mumctl/src/main.rs b/mumctl/src/main.rs index 99e0608..84517d5 100644 --- a/mumctl/src/main.rs +++ b/mumctl/src/main.rs @@ -382,7 +382,7 @@ fn match_opt() -> Result<(), Error> { let msg = MumCommand::SendMessage { message, target: if names.is_empty() { - MessageTarget::Channel(vec![(ChannelTarget::Default, recursive)]) + MessageTarget::Channel(vec![(ChannelTarget::Current, recursive)]) } else { MessageTarget::Channel( names -- cgit v1.2.1