mirror of
https://github.com/flibusta-apps/book_bot.git
synced 2025-12-06 07:25:36 +01:00
Fix
This commit is contained in:
@@ -160,12 +160,12 @@ where
|
||||
}
|
||||
};
|
||||
|
||||
if items_page.total_pages == 0 {
|
||||
if items_page.pages == 0 {
|
||||
bot.send_message(chat_id, "Книги не найдены!").send().await?;
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let total_pages = items_page.total_pages;
|
||||
let total_pages = items_page.pages;
|
||||
let footer = format!("\n\nСтраница 1/{total_pages}");
|
||||
|
||||
let formated_items = items_page.format_items(4096 - footer.len());
|
||||
@@ -238,13 +238,13 @@ where
|
||||
}
|
||||
};
|
||||
|
||||
if items_page.total_pages == 0 {
|
||||
if items_page.pages == 0 {
|
||||
bot.send_message(chat_id, "Книги не найдены!").send().await?;
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if page > items_page.total_pages {
|
||||
items_page = match books_getter(id, items_page.total_pages, allowed_langs.clone()).await {
|
||||
if page > items_page.pages {
|
||||
items_page = match books_getter(id, items_page.pages, allowed_langs.clone()).await {
|
||||
Ok(v) => v,
|
||||
Err(err) => {
|
||||
bot
|
||||
@@ -257,7 +257,7 @@ where
|
||||
};
|
||||
}
|
||||
|
||||
let total_pages = items_page.total_pages;
|
||||
let total_pages = items_page.pages;
|
||||
let footer = format!("\n\nСтраница {page}/{total_pages}");
|
||||
|
||||
let formated_items = items_page.format_items(4096 - footer.len());
|
||||
|
||||
@@ -156,7 +156,7 @@ where
|
||||
}
|
||||
};
|
||||
|
||||
if items_page.total_pages == 0 {
|
||||
if items_page.pages == 0 {
|
||||
let message_text = match search_data {
|
||||
SearchCallbackData::Book { .. } => "Книги не найдены!",
|
||||
SearchCallbackData::Authors { .. } => "Авторы не найдены!",
|
||||
@@ -168,10 +168,10 @@ where
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
if page > items_page.total_pages {
|
||||
if page > items_page.pages {
|
||||
items_page = match items_getter(
|
||||
query.clone(),
|
||||
items_page.total_pages,
|
||||
items_page.pages,
|
||||
allowed_langs.clone(),
|
||||
)
|
||||
.await
|
||||
@@ -188,7 +188,7 @@ where
|
||||
};
|
||||
}
|
||||
|
||||
let total_pages = items_page.total_pages;
|
||||
let total_pages = items_page.pages;
|
||||
let footer = format!("\n\nСтраница {page}/{total_pages}");
|
||||
|
||||
let formated_items = items_page.format_items(4096 - footer.len());
|
||||
|
||||
@@ -157,7 +157,7 @@ async fn update_log_pagination_handler(
|
||||
)
|
||||
.await?;
|
||||
|
||||
if items_page.total_pages == 0 {
|
||||
if items_page.pages == 0 {
|
||||
bot
|
||||
.send_message(message.chat.id, "Нет новых книг за этот период.")
|
||||
.send()
|
||||
@@ -165,16 +165,16 @@ async fn update_log_pagination_handler(
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
if update_callback_data.page > items_page.total_pages {
|
||||
if update_callback_data.page > items_page.pages {
|
||||
items_page = get_uploaded_books(
|
||||
items_page.total_pages,
|
||||
items_page.pages,
|
||||
update_callback_data.from.format("%Y-%m-%d").to_string(),
|
||||
update_callback_data.to.format("%Y-%m-%d").to_string(),
|
||||
).await?;
|
||||
}
|
||||
|
||||
let page = update_callback_data.page;
|
||||
let total_pages = items_page.total_pages;
|
||||
let total_pages = items_page.pages;
|
||||
let footer = format!("\n\nСтраница {page}/{total_pages}");
|
||||
|
||||
let formated_items = items_page.format_items(4096 - footer.len());
|
||||
|
||||
@@ -75,9 +75,11 @@ pub struct Genre {
|
||||
pub struct Page<T> {
|
||||
pub items: Vec<T>,
|
||||
pub total: u32,
|
||||
|
||||
pub page: u32,
|
||||
|
||||
pub size: u32,
|
||||
pub total_pages: u32,
|
||||
pub pages: u32,
|
||||
}
|
||||
|
||||
impl<T> Page<T>
|
||||
|
||||
Reference in New Issue
Block a user