OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-14 11:44:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some compilation errors

Browse source
This commit is contained in:
Temirkhan Myrzamadi 2020-02-23 02:08:45 +06:00
parent a3e5331312
commit 43a8c21b68
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/dispatching/dispatcher_handler_rx_ext.rs
View file

@ -48,16 +48,18 @@ where
Self: Stream<Item = DispatcherHandlerCx<Message>>,
C: BotCommand,
{
Box::pin(self.text_messages().filter_map(|(cx, text)| async move {
C::parse(&text, bot_name).map(|(command, args)| {
(
cx,
command,
args.into_iter()
.map(ToOwned::to_owned)
.collect::<Vec<String>>(),
)
})
}))
Box::pin(self.text_messages().filter_map(
move |(cx, text)| async move {
C::parse(&text, bot_name).map(|(command, args)| {
(
cx,
command,
args.into_iter()
.map(ToOwned::to_owned)
.collect::<Vec<String>>(),
)
})
},
))
}
}

17
src/utils/command.rs
View file

@ -92,7 +92,10 @@ pub use teloxide_macros::BotCommand;
pub trait BotCommand: Sized {
fn try_from(s: &str) -> Option<Self>;
fn descriptions() -> String;
fn parse<'a, 'b>(s: &'a str, bot_name: &'b str) -> Option<(Self, Vec<&'a str>)>;
fn parse<'a, 'b>(
s: &'a str,
bot_name: &'b str,
) -> Option<(Self, Vec<&'a str>)>;
}
/// Parses a string into a command with args.
@ -226,21 +229,21 @@ mod tests {
assert_eq!(
DefaultCommands::Start,
DefaultCommands::parse("/start").unwrap().0
DefaultCommands::parse("/start", "MyNameBot").unwrap().0
);
assert_eq!(
DefaultCommands::Help,
DefaultCommands::parse("!help").unwrap().0
DefaultCommands::parse("!help", "MyNameBot").unwrap().0
);
assert_eq!(
DefaultCommands::descriptions(),
"Bot commands\n/start - \n!help - \n"
);
}
#[test]
fn parse_command_with_botname() {
#[command(rename = "lowercase", )]
fn parse_command_with_bot_name() {
#[command(rename = "lowercase")]
#[derive(BotCommand, Debug, PartialEq)]
enum DefaultCommands {
#[command(prefix = "/")]
@ -250,7 +253,7 @@ mod tests {
assert_eq!(
DefaultCommands::Start,
DefaultCommands::parse("/start@botname").unwrap().0
DefaultCommands::parse("/start@MyNameBot", "MyNameBot").unwrap().0
);
}
}