From e52d6042a37068f1b7e6a08f7bfd6a43856ebe7e Mon Sep 17 00:00:00 2001 From: doryan Date: Wed, 5 Jun 2024 14:21:12 +0400 Subject: [PATCH] some fixes --- src/handlers/actions/ban.rs | 6 +++--- src/main.rs | 3 ++- src/middlewares/admin_check_middleware.rs | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/handlers/actions/ban.rs b/src/handlers/actions/ban.rs index aa2f530..90916c3 100644 --- a/src/handlers/actions/ban.rs +++ b/src/handlers/actions/ban.rs @@ -21,7 +21,6 @@ pub async fn ban_member( ) -> HandlerResult { let (bot, message, mut sender_builder): ExtractedEntityData = handler_entity.extract(); - println!("дошло"); let user_id: i64 = match user.get_id() { Some(id) => id, None => { @@ -38,15 +37,16 @@ pub async fn ban_member( sleep(DurationSleep::from_millis(delay)).await; - let future = || async { ban_chat_member(&bot, user_id, chat_id).await }; + let callback = || async { ban_chat_member(&bot, user_id, chat_id).await }; let demote_args: (&Bot, i64, i64) = (&bot, user_id, chat_id); sender_builder .set_text("Невозможно забанить участника чата, демотните своими силами и попробуйте снова"); - if try_restrict(future, demote_args, sender_builder.clone().build()) + if try_restrict(callback, demote_args, sender_builder.clone().build()) .await .is_err() { + sender_builder.build().send(&bot).await?; Ok(EventReturn::Cancel) } else { let banned_user_name: String = user.get_user_name(&bot, &message).await.unwrap(); diff --git a/src/main.rs b/src/main.rs index 0f2838a..795c354 100644 --- a/src/main.rs +++ b/src/main.rs @@ -72,7 +72,8 @@ async fn main() { command.include(admin_commands).include(default_commands); - route.include(dice).include(command); + route.include(command); + route.include(dice); let dispatcher = Dispatcher::builder().main_router(route).bot(bot).build(); diff --git a/src/middlewares/admin_check_middleware.rs b/src/middlewares/admin_check_middleware.rs index ece0e1a..806f633 100644 --- a/src/middlewares/admin_check_middleware.rs +++ b/src/middlewares/admin_check_middleware.rs @@ -34,6 +34,7 @@ impl InnerMiddleware for AdminCheck { let response = next(request).await?; return Ok(response); } else { + println!("lol"); MessageSender::builder(chat_id) .text("У ваc нет прав администратора, чтобы использовать эту команду.") .build()