From 69096dc01dc24f867e4e4ed1054c04762c495387 Mon Sep 17 00:00:00 2001 From: P0lunin Date: Sat, 19 Oct 2019 21:06:36 +0300 Subject: [PATCH] Revert "added handle_message function" This reverts commit e7ef38c1 --- src/dispatcher/simple/mod.rs | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/dispatcher/simple/mod.rs b/src/dispatcher/simple/mod.rs index d9301228..5c7048f5 100644 --- a/src/dispatcher/simple/mod.rs +++ b/src/dispatcher/simple/mod.rs @@ -227,16 +227,16 @@ where match kind { UpdateKind::Message(mes) => { - self.handle_message(mes, &self.message_handlers).await; + call!(self.message_handlers, mes) } UpdateKind::EditedMessage(mes) => { - self.handle_message(mes, &self.edited_message_handlers).await; + call!(self.edited_message_handlers, mes) } UpdateKind::ChannelPost(post) => { - self.handle_message(post, &self.channel_post_handlers).await; + call!(self.channel_post_handlers, post) } UpdateKind::EditedChannelPost(post) => { - self.handle_message(post, &self.edited_channel_post_handlers).await; + call!(self.edited_channel_post_handlers, post) } UpdateKind::InlineQuery(query) => { call!(self.inline_query_handlers, query) @@ -252,27 +252,6 @@ 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)]