Skip to content

Added support for text/unknown-text msg handlers #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sumeetchhetri wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for text/unknown-text msg handlers #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 46 additions & 4 deletions src/bot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ pub struct Bot {
update_interval: u64,
timeout: u64,
pub handlers: HashMap<String, UnboundedSender<(RequestHandle, objects::Message)>>,
pub unknown_handler: Option<UnboundedSender<(RequestHandle, objects::Message)>>,
pub unknown_cmd_handler: Option<UnboundedSender<(RequestHandle, objects::Message)>>,
pub unknown_text_handler: Option<UnboundedSender<(RequestHandle, objects::Message)>>,
pub callback_handler: Option<UnboundedSender<(RequestHandle, objects::CallbackQuery)>>,
pub inline_handler: Option<UnboundedSender<(RequestHandle, objects::InlineQuery)>>
}
Expand All @@ -192,7 +193,8 @@ impl Bot {
update_interval: 2000,
timeout: 3600,
handlers: HashMap::new(),
unknown_handler: None,
unknown_cmd_handler: None,
unknown_text_handler: None,
callback_handler: None,
inline_handler: None
}
Expand Down Expand Up @@ -237,11 +239,32 @@ impl Bot {
receiver.map_err(|_| Error::from(ErrorKind::Channel))
}

/// Creates a new text based command and returns a stream which will yield a message when the text is sent
pub fn new_text(
&mut self,
cmd: &str,
) -> impl Stream<Item = (RequestHandle, objects::Message), Error = Error> {
let (sender, receiver) = mpsc::unbounded();

self.handlers.insert(cmd.into(), sender);

receiver.map_err(|_| Error::from(ErrorKind::Channel))
}

/// Returns a stream which will yield a message when none of previously registered text based command matches
pub fn unknown_text(&mut self) -> impl Stream<Item = (RequestHandle, objects::Message), Error = Error> {
let (sender, receiver) = mpsc::unbounded();

self.unknown_text_handler = Some(sender);

receiver.then(|x| x.map_err(|_| Error::from(ErrorKind::Channel)))
}

/// Returns a stream which will yield a message when none of previously registered commands matches
pub fn unknown_cmd(&mut self) -> impl Stream<Item = (RequestHandle, objects::Message), Error = Error> {
let (sender, receiver) = mpsc::unbounded();

self.unknown_handler = Some(sender);
self.unknown_cmd_handler = Some(sender);

receiver.then(|x| x.map_err(|_| Error::from(ErrorKind::Channel)))
}
Expand Down Expand Up @@ -342,12 +365,31 @@ impl Bot {
sndr = Some(sender.clone());
message.text = Some(content.collect::<Vec<&str>>().join(" "));
} else if let Some(ref sender) =
self.unknown_handler
self.unknown_cmd_handler
{
sndr = Some(sender.clone());
}
}
}
} else if let Some(text) = message.text.clone() {
let mut content = text.split_whitespace();
if let Some(cmd) = content.next() {
if let Some(sender) = self.handlers.get(cmd)
{
sndr = Some(sender.clone());
message.text = Some(content.collect::<Vec<&str>>().join(" "));
}
else if let Some(ref sender) = self.unknown_text_handler
{
sndr = Some(sender.clone());
message.text = Some(content.collect::<Vec<&str>>().join(" "));
}
}
else if let Some(ref sender) = self.unknown_text_handler
{
sndr = Some(sender.clone());
message.text = Some(content.collect::<Vec<&str>>().join(" "));
}
}
}

Expand Down