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

feature: variants #22

Merged
akulij merged 19 commits from dev into main 2025-06-05 20:53:03 +00:00
Conversation 0 Commits 19 Files Changed 5 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2662a00776 - Show all commits

12
src/bot_handler.rs
View File

@ -13,7 +13,7 @@ use teloxide::{
}; };
use crate::{ use crate::{
botscript::{self, BotMessage, RunnerConfig}, botscript::{self, message_info::MessageInfoBuilder, BotMessage, RunnerConfig},
commands::BotCommand, commands::BotCommand,
db::{CallDB, DB}, db::{CallDB, DB},
message_answerer::MessageAnswerer, message_answerer::MessageAnswerer,
@ -105,12 +105,16 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
None => break 'prop true, None => break 'prop true,
}; };
let jsuser = to_js(ctx, &tguser).unwrap(); let jsuser = to_js(ctx, &tguser).unwrap();
let mi = MessageInfoBuilder::new()
.set_variant(variant.clone())
.build();
let mi = to_js(ctx, &mi).unwrap();
info!( info!(
"Calling handler {:?} with msg literal: {:?}", "Calling handler {:?} with msg literal: {:?}",
handler, handler,
bm.literal() bm.literal()
); );
match handler.call_args(vec![jsuser]) { match handler.call_args(vec![jsuser, mi]) {
Ok(v) => { Ok(v) => {
if v.is_bool() { if v.is_bool() {
v.to_bool().unwrap_or(true) v.to_bool().unwrap_or(true)
@ -181,12 +185,14 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
None => break 'prop true, None => break 'prop true,
}; };
let jsuser = to_js(ctx, &tguser).unwrap(); let jsuser = to_js(ctx, &tguser).unwrap();
let mi = MessageInfoBuilder::new().build();
let mi = to_js(ctx, &mi).unwrap();
println!( println!(
"Calling handler {:?} with msg literal: {:?}", "Calling handler {:?} with msg literal: {:?}",
handler, handler,
bm.literal() bm.literal()
); );
match handler.call_args(vec![jsuser]) { match handler.call_args(vec![jsuser, mi]) {
Ok(v) => { Ok(v) => {
println!("Ok branch, got value: {v:?}"); println!("Ok branch, got value: {v:?}");
if v.is_bool() { if v.is_bool() {