dev #25

Merged
akulij merged 38 commits from dev into main 2025-06-18 17:10:44 +00:00
2 changed files with 1 additions and 14 deletions
Showing only changes of commit 0c3fb0788a - Show all commits

View File

@ -208,7 +208,6 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
let user = update_user_tg(user, &tguser); let user = update_user_tg(user, &tguser);
user.update_user(&mut db).await?; user.update_user(&mut db).await?;
println!("Is handler set: {}", bm.get_handler().is_some());
let is_propagate: bool = match bm.get_handler() { let is_propagate: bool = match bm.get_handler() {
Some(handler) => 'prop: { Some(handler) => 'prop: {
let ctx = match handler.context() { let ctx = match handler.context() {
@ -219,14 +218,8 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
let jsuser = to_js(ctx, &tguser).unwrap(); let jsuser = to_js(ctx, &tguser).unwrap();
let mi = MessageInfoBuilder::new().build(); let mi = MessageInfoBuilder::new().build();
let mi = to_js(ctx, &mi).unwrap(); let mi = to_js(ctx, &mi).unwrap();
println!(
"Calling handler {:?} with msg literal: {:?}",
handler,
bm.literal()
);
match handler.call_args(vec![jsuser, mi]) { match handler.call_args(vec![jsuser, mi]) {
Ok(v) => { Ok(v) => {
println!("Ok branch, got value: {v:?}");
if v.is_bool() { if v.is_bool() {
v.to_bool().unwrap_or(true) v.to_bool().unwrap_or(true)
} else if v.is_int() { } else if v.is_int() {
@ -237,7 +230,6 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
} }
} }
Err(err) => { Err(err) => {
println!("ERR branch");
error!("Failed to get return of handler, err: {err}"); error!("Failed to get return of handler, err: {err}");
// falling back to propagation // falling back to propagation
true true
@ -312,7 +304,7 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
Ok(msg_id) => { Ok(msg_id) => {
ma.replace_message(msg_id, literal, buttons).await?; ma.replace_message(msg_id, literal, buttons).await?;
} }
Err(err) => { Err(_) => {
ma.answer(literal, None, buttons).await?; ma.answer(literal, None, buttons).await?;
} }
}; };

View File

@ -29,7 +29,6 @@ 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> {
println!("user_application is called");
let db = db.clone(); let db = db.clone();
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,
@ -39,7 +38,6 @@ pub fn attach_user_application(
let application = futures::executor::block_on( let application = futures::executor::block_on(
Application::new(user.clone()).store_db(&mut db.write().unwrap()), Application::new(user.clone()).store_db(&mut db.write().unwrap()),
)?; )?;
println!("there1");
let db2 = db.clone(); let db2 = db.clone();
let msg = tokio::task::block_in_place(move || { let msg = tokio::task::block_in_place(move || {
@ -52,7 +50,6 @@ pub fn attach_user_application(
.await .await
}) })
}); });
println!("there2");
let msg = match msg { let msg = match msg {
Ok(msg) => msg, Ok(msg) => msg,
Err(err) => { Err(err) => {
@ -70,12 +67,10 @@ pub fn attach_user_application(
.answer("left_application_msg", None, None), .answer("left_application_msg", None, None),
) )
.unwrap(); .unwrap();
println!("there3");
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().unwrap()),
)?; )?;
println!("there4");
let ret = true; let ret = true;
Ok(ret) Ok(ret)