From e7ef38c1b2d6728b38e5e532abef91408a11276d Mon Sep 17 00:00:00 2001
From: P0lunin <polunindima2002@gmail.com>
Date: Sat, 19 Oct 2019 20:48:02 +0300
Subject: [PATCH] added handle_message function
---
src/dispatcher/simple/mod.rs | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/dispatcher/simple/mod.rs b/src/dispatcher/simple/mod.rs
index 5c7048f5..d9301228 100644
--- a/src/dispatcher/simple/mod.rs
+++ b/src/dispatcher/simple/mod.rs
@@ -227,16 +227,16 @@ where
match kind {
UpdateKind::Message(mes) => {
- call!(self.message_handlers, mes)
+ self.handle_message(mes, &self.message_handlers).await;
}
UpdateKind::EditedMessage(mes) => {
- call!(self.edited_message_handlers, mes)
+ self.handle_message(mes, &self.edited_message_handlers).await;
}
UpdateKind::ChannelPost(post) => {
- call!(self.channel_post_handlers, post)
+ self.handle_message(post, &self.channel_post_handlers).await;
}
UpdateKind::EditedChannelPost(post) => {
- call!(self.edited_channel_post_handlers, post)
+ self.handle_message(post, &self.edited_channel_post_handlers).await;
}
UpdateKind::InlineQuery(query) => {
call!(self.inline_query_handlers, query)
@@ -252,6 +252,27 @@ where
})
.await;
}
+
+ async fn handle_message(&self, message: Message, handlers: &Handlers<'a, Message, E>) {
+ let handler = handlers.iter().find_map(|e|{
+ let (filter, handler) = e;
+ if filter.test(&message) {
+ Some(handler)
+ } else {
+ None
+ }
+ });
+ match handler {
+ Some(handler) => {
+ if let Err(err) = handler.handle(message).await {
+ self.error_policy.handle_error(err).await
+ }
+ }
+ None => {
+ log::warn!("unhandled update {:?}", message);
+ }
+ }
+ }
}
#[async_trait(? Send)]