mykola/mk-dl-bot_legacy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

cargo fmt

Browse source
This commit is contained in:
mykola2312 2024-03-08 05:24:09 +02:00
parent 3d821e3ba5
commit caa4bc1a91
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/bot/request.rs
View file

@ -1,7 +1,7 @@
use rust_i18n::t; use rust_i18n::t;
use sqlx::Row; use sqlx::Row;
use teloxide::types::Recipient;
use teloxide::prelude::*; use teloxide::prelude::*;
use teloxide::types::Recipient;
use tracing::{event, Level}; use tracing::{event, Level};
use super::notify::notify_admins; use super::notify::notify_admins;
@ -190,7 +190,8 @@ pub async fn cmd_decline(bot: Bot, msg: Message, id: String, db: DbPool) -> Hand
// decline request // decline request
sqlx::query("DELETE FROM request WHERE id = $1;") sqlx::query("DELETE FROM request WHERE id = $1;")
.bind(request.request_id) .bind(request.request_id)
.execute(&db).await?; .execute(&db)
.await?;
event!( event!(
Level::INFO, Level::INFO,
"declined request {} by {} for {}", "declined request {} by {} for {}",

35
src/bot/request_chat.rs
View file

@ -1,14 +1,14 @@
use rust_i18n::t; use rust_i18n::t;
use sqlx::Row; use sqlx::Row;
use teloxide::types::Recipient;
use teloxide::prelude::*; use teloxide::prelude::*;
use teloxide::types::Recipient;
use tracing::{event, Level}; use tracing::{event, Level};
use super::notify::notify_admins; use super::notify::notify_admins;
use super::types::HandlerResult; use super::types::HandlerResult;
use crate::db::user::find_or_create_user;
use crate::db::chat::find_or_create_chat; use crate::db::chat::find_or_create_chat;
use crate::db::{DbPool, Chat}; use crate::db::user::find_or_create_user;
use crate::db::{Chat, DbPool};
use crate::{parse_integer, reply_i18n_and_return}; use crate::{parse_integer, reply_i18n_and_return};
pub async fn cmd_request_chat(bot: Bot, msg: Message, text: String, db: DbPool) -> HandlerResult { pub async fn cmd_request_chat(bot: Bot, msg: Message, text: String, db: DbPool) -> HandlerResult {
@ -26,11 +26,12 @@ pub async fn cmd_request_chat(bot: Bot, msg: Message, text: String, db: DbPool)
reply_i18n_and_return!(bot, msg.chat.id, "chat_already_can_download"); reply_i18n_and_return!(bot, msg.chat.id, "chat_already_can_download");
} }
let requests: i64 = sqlx::query("SELECT COUNT(1) FROM request_chat WHERE requested_for = $1;") let requests: i64 =
.bind(chat.id) sqlx::query("SELECT COUNT(1) FROM request_chat WHERE requested_for = $1;")
.fetch_one(&db) .bind(chat.id)
.await? .fetch_one(&db)
.get(0); .await?
.get(0);
if requests > 0 { if requests > 0 {
reply_i18n_and_return!(bot, msg.chat.id, "chat_already_has_requested"); reply_i18n_and_return!(bot, msg.chat.id, "chat_already_has_requested");
} }
@ -53,7 +54,8 @@ pub async fn cmd_request_chat(bot: Bot, msg: Message, text: String, db: DbPool)
) )
.await?; .await?;
bot.send_message(msg.chat.id, t!("chat_request_added")).await?; bot.send_message(msg.chat.id, t!("chat_request_added"))
.await?;
} }
Ok(()) Ok(())
@ -144,7 +146,11 @@ pub async fn cmd_approve_chat(bot: Bot, msg: Message, id: String, db: DbPool) ->
request.chat request.chat
); );
// notify target chat // notify target chat
bot.send_message(Recipient::Id(ChatId(request.chat.tg_id)), t!("chat_request_approved")).await?; bot.send_message(
Recipient::Id(ChatId(request.chat.tg_id)),
t!("chat_request_approved"),
)
.await?;
} }
Ok(()) Ok(())
@ -185,7 +191,8 @@ pub async fn cmd_decline_chat(bot: Bot, msg: Message, id: String, db: DbPool) ->
// decline request // decline request
sqlx::query("DELETE FROM request_chat WHERE id = $1;") sqlx::query("DELETE FROM request_chat WHERE id = $1;")
.bind(request.request_id) .bind(request.request_id)
.execute(&db).await?; .execute(&db)
.await?;
event!( event!(
Level::INFO, Level::INFO,
"declined request {} by {} for {}", "declined request {} by {} for {}",
@ -197,7 +204,11 @@ pub async fn cmd_decline_chat(bot: Bot, msg: Message, id: String, db: DbPool) ->
.await?; .await?;
// notify target chat // notify target chat
bot.send_message(Recipient::Id(ChatId(request.chat.tg_id)), t!("chat_request_declined")).await?; bot.send_message(
Recipient::Id(ChatId(request.chat.tg_id)),
t!("chat_request_declined"),
)
.await?;
} }
Ok(()) Ok(())