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

Fix allowed_langs getting

Browse Source
This commit is contained in:
Bulat Kurbanov
2022-09-18 09:27:13 +03:00
parent 36305b665d
commit 06d8c2cf60
3 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ use regex::Regex;
use strum_macros::EnumIter;
use teloxide::{
prelude::*,
types::{InlineKeyboardButton, InlineKeyboardMarkup},
types::{InlineKeyboardButton, InlineKeyboardMarkup}, dispatching::dialogue::GetChatId,
};
use crate::bots::{
@@ -115,18 +115,14 @@ where
T: Format + Clone,
Fut: std::future::Future<Output = Result<Page<T>, Box<dyn std::error::Error + Send + Sync>>>,
{
let chat_id = cq.message.as_ref().map(|message| message.chat.id);
let user_id = cq
.message
.as_ref()
.map(|message| message.from().map(|from| from.id))
.unwrap_or(None);
let chat_id = cq.chat_id();
let user_id = cq.from.id;
let message_id = cq.message.as_ref().map(|message| message.id);
let query = get_query(cq);
let (chat_id, user_id, query, message_id) = match (chat_id, user_id, query, message_id) {
(Some(chat_id), Some(user_id), Some(query), Some(message_id)) => {
(chat_id, user_id, query, message_id)
let (chat_id, query, message_id) = match (chat_id, query, message_id) {
(Some(chat_id), Some(query), Some(message_id)) => {
(chat_id, query, message_id)
}
_ => {
return match chat_id {