akulij/gongbotrs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warnings in botscript/application

Browse Source
This commit is contained in:
Akulij 2025-06-07 03:17:34 +05:00
parent c0eb5ba412
commit 51e4d1a1fc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/botscript/application.rs
View File

@ -1,3 +1,5 @@
// just keeping track locks in asychronous calls
#![allow(clippy::await_holding_lock)]
use std::sync::RwLock; use std::sync::RwLock;
use log::info; use log::info;
@ -26,8 +28,8 @@ pub fn attach_user_application(
let user_application = let user_application =
c.create_callback(move |q: OwnedJsObject| -> Result<_, ScriptError> { c.create_callback(move |q: OwnedJsObject| -> Result<_, ScriptError> {
let bot1 = bot.clone(); let bot1 = bot.clone();
let bot1 = bot1.read().expect("Can't read bot"); let bot1 = bot1.read().expect("Can't read lock bot");
let bot2 = bot.read().expect("Can't read bot"); let bot2 = bot.read().expect("Can't read lock bot");
let user: teloxide::types::User = match from_js(q.context(), &q) { let user: teloxide::types::User = match from_js(q.context(), &q) {
Ok(q) => q, Ok(q) => q,
Err(_) => todo!(), Err(_) => todo!(),
@ -35,7 +37,7 @@ pub fn attach_user_application(
let application = futures::executor::block_on( let application = futures::executor::block_on(
Application::new(user.clone()) Application::new(user.clone())
.store_db(&mut db.write().expect("Can't write to db rwlock")), .store_db(&mut db.write().expect("Can't write lock db")),
)?; )?;
let db2 = db.clone(); let db2 = db.clone();
@ -43,7 +45,7 @@ pub fn attach_user_application(
Handle::current().block_on(async move { Handle::current().block_on(async move {
send_application_to_chat( send_application_to_chat(
&bot1, &bot1,
&mut db2.write().expect("Can't write to db rwlock"), &mut db2.write().expect("Can't write lock db"),
&application, &application,
) )
.await .await
@ -60,14 +62,14 @@ pub fn attach_user_application(
let (chat_id, msg_id) = futures::executor::block_on( let (chat_id, msg_id) = futures::executor::block_on(
MessageAnswerer::new( MessageAnswerer::new(
&bot2, &bot2,
&mut db.write().expect("Can't write to db rwlock"), &mut db.write().expect("Can't write lock db"),
user.id.0 as i64, user.id.0 as i64,
) )
.answer("left_application_msg", None, None), .answer("left_application_msg", None, None),
)?; )?;
futures::executor::block_on( futures::executor::block_on(
MessageForward::new(msg.chat.id.0, msg.id.0, chat_id, msg_id, false) MessageForward::new(msg.chat.id.0, msg.id.0, chat_id, msg_id, false)
.store_db(&mut db.write().unwrap()), .store_db(&mut db.write().expect("Can't write lock db")),
)?; )?;
let ret = true; let ret = true;