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

fix: do not box leak in botscript/application

Browse Source
This commit is contained in:
Akulij 2025-06-07 02:27:42 +05:00
parent e6c9cfb0c1
commit 8e57f5da7e
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/botscript/application.rs
View File

@ -20,16 +20,14 @@ pub fn attach_user_application(
bot: &Bot, bot: &Bot,
) -> Result<(), ScriptError> { ) -> Result<(), ScriptError> {
let db: std::sync::Arc<RwLock<DB>> = std::sync::Arc::new(RwLock::new(db.clone())); let db: std::sync::Arc<RwLock<DB>> = std::sync::Arc::new(RwLock::new(db.clone()));
let dbbox = Box::new(db.clone());
let db: &'static _ = Box::leak(dbbox);
let bot: std::sync::Arc<RwLock<Bot>> = std::sync::Arc::new(RwLock::new(bot.clone())); let bot: std::sync::Arc<RwLock<Bot>> = std::sync::Arc::new(RwLock::new(bot.clone()));
let botbox = Box::new(bot.clone());
let bot: &'static _ = Box::leak(botbox);
let user_application = let user_application =
c.create_callback(move |q: OwnedJsObject| -> Result<_, ScriptError> { c.create_callback(move |q: OwnedJsObject| -> Result<_, ScriptError> {
let db = db.clone(); let bot1 = bot.clone();
let bot1 = bot1.read().unwrap();
let bot2 = bot.read().unwrap();
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!(),
@ -42,12 +40,7 @@ pub fn attach_user_application(
let db2 = db.clone(); let db2 = db.clone();
let msg = tokio::task::block_in_place(move || { let msg = tokio::task::block_in_place(move || {
Handle::current().block_on(async move { Handle::current().block_on(async move {
send_application_to_chat( send_application_to_chat(&bot1, &mut db2.write().unwrap(), &application).await
&bot.read().unwrap(),
&mut db2.write().unwrap(),
&application,
)
.await
}) })
}); });
let msg = match msg { let msg = match msg {
@ -59,12 +52,11 @@ 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, &mut db.write().unwrap(), user.id.0 as i64).answer(
&bot.read().unwrap(), "left_application_msg",
&mut db.write().unwrap(), None,
user.id.0 as i64, None,
) ),
.answer("left_application_msg", None, None),
) )
.unwrap(); .unwrap();
futures::executor::block_on( futures::executor::block_on(