flibusta-apps/book_bot
1
0
Fork 0
mirror of https://github.com/flibusta-apps/book_bot.git synced 2025-12-06 15:35:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update teloxide lib

Browse Source
This commit is contained in:
Bulat Kurbanov
2023-05-03 23:12:04 +02:00
parent 9bf9a86954
commit b7fd1cfa7c
14 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bots/approved_bot/modules/random.rs
View File

@@ -17,7 +17,7 @@ use crate::bots::{
};
#[derive(BotCommands, Clone)]
#[command(rename = "lowercase")]
#[command(rename_rule = "lowercase")]
enum RandomCommand {
Random,
}
@@ -75,7 +75,7 @@ impl std::str::FromStr for RandomCallbackData {
}
}
async fn random_handler(message: Message, bot: AutoSend<Bot>) -> crate::bots::BotHandlerInternal {
async fn random_handler(message: Message, bot: Bot) -> crate::bots::BotHandlerInternal {
const MESSAGE_TEXT: &str = "Что хотим получить?";
let keyboard = InlineKeyboardMarkup {
@@ -122,7 +122,7 @@ async fn random_handler(message: Message, bot: AutoSend<Bot>) -> crate::bots::Bo
async fn get_random_item_handler_internal<T>(
cq: CallbackQuery,
bot: AutoSend<Bot>,
bot: Bot,
item: Result<T, Box<dyn std::error::Error + Send + Sync>>,
) -> BotHandlerInternal
where
@@ -176,7 +176,7 @@ where
async fn get_random_item_handler<T, Fut>(
cq: CallbackQuery,
bot: AutoSend<Bot>,
bot: Bot,
item_getter: fn(allowed_langs: Vec<String>) -> Fut,
) -> BotHandlerInternal
where
@@ -190,7 +190,7 @@ where
get_random_item_handler_internal(cq, bot, item).await
}
async fn get_genre_metas_handler(cq: CallbackQuery, bot: AutoSend<Bot>) -> BotHandlerInternal {
async fn get_genre_metas_handler(cq: CallbackQuery, bot: Bot) -> BotHandlerInternal {
let genre_metas = match book_library::get_genre_metas().await {
Ok(v) => v,
Err(err) => return Err(err),
@@ -243,7 +243,7 @@ async fn get_genre_metas_handler(cq: CallbackQuery, bot: AutoSend<Bot>) -> BotHa
async fn get_genres_by_meta_handler(
cq: CallbackQuery,
bot: AutoSend<Bot>,
bot: Bot,
genre_index: u32,
) -> BotHandlerInternal {
let genre_metas = match book_library::get_genre_metas().await {
@@ -323,7 +323,7 @@ async fn get_genres_by_meta_handler(
async fn get_random_book_by_genre(
cq: CallbackQuery,
bot: AutoSend<Bot>,
bot: Bot,
genre_id: u32,
) -> BotHandlerInternal {
let allowed_langs = get_user_or_default_lang_codes(cq.from.id).await;
@@ -350,7 +350,7 @@ pub fn get_random_hander() -> crate::bots::BotHandler {
.branch(
Update::filter_callback_query()
.chain(filter_callback_query::<RandomCallbackData>())
.endpoint(|cq: CallbackQuery, callback_data: RandomCallbackData, bot: AutoSend<Bot>| async move {
.endpoint(|cq: CallbackQuery, callback_data: RandomCallbackData, bot: Bot| async move {
match callback_data {
RandomCallbackData::RandomBook => get_random_item_handler(cq, bot, book_library::get_random_book).await,
RandomCallbackData::RandomAuthor => get_random_item_handler(cq, bot, book_library::get_random_author).await,