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

dev #25

Merged
akulij merged 38 commits from dev into main 2025-06-18 17:10:44 +00:00
Conversation 0 Commits 38 Files Changed 19 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f6a5a42b71 - Show all commits

10
src/bot_handler.rs
View File

@ -15,7 +15,7 @@ use teloxide::{
}; };
use crate::{ use crate::{
botscript::{self, message_info::MessageInfoBuilder, BotMessage}, botscript::{self, message_info::MessageInfoBuilder, BotMessage, ScriptError},
commands::BotCommand, commands::BotCommand,
db::{callback_info::CallbackInfo, CallDB, DB}, db::{callback_info::CallbackInfo, CallDB, DB},
message_answerer::MessageAnswerer, message_answerer::MessageAnswerer,
@ -121,11 +121,11 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
// falling back to propagation // falling back to propagation
None => break 'prop true, None => break 'prop true,
}; };
let jsuser = to_js(ctx, &tguser).unwrap(); let jsuser = to_js(ctx, &tguser).map_err(ScriptError::from)?;
let mi = MessageInfoBuilder::new() let mi = MessageInfoBuilder::new()
.set_variant(variant.clone()) .set_variant(variant.clone())
.build(); .build();
let mi = to_js(ctx, &mi).unwrap(); let mi = to_js(ctx, &mi).map_err(ScriptError::from)?;
info!( info!(
"Calling handler {:?} with msg literal: {:?}", "Calling handler {:?} with msg literal: {:?}",
handler, handler,
@ -215,9 +215,9 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
// falling back to propagation // falling back to propagation
None => break 'prop true, None => break 'prop true,
}; };
let jsuser = to_js(ctx, &tguser).unwrap(); let jsuser = to_js(ctx, &tguser).map_err(ScriptError::from)?;
let mi = MessageInfoBuilder::new().build(); let mi = MessageInfoBuilder::new().build();
let mi = to_js(ctx, &mi).unwrap(); let mi = to_js(ctx, &mi).map_err(ScriptError::from)?;
match handler.call_args(vec![jsuser, mi]) { match handler.call_args(vec![jsuser, mi]) {
Ok(v) => { Ok(v) => {
if v.is_bool() { if v.is_bool() {