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 +30 -1
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e356ac067 - Show all commits

31
src/bot_handler.rs
View File

@ -1,5 +1,5 @@
use log::{error, info}; use log::{error, info};
use quickjs_rusty::serde::to_js; use quickjs_rusty::serde::{from_js, to_js};
use std::{ use std::{
str::FromStr, str::FromStr,
sync::{Arc, Mutex, RwLock}, sync::{Arc, Mutex, RwLock},
@ -120,6 +120,23 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
v.to_bool().unwrap_or(true) v.to_bool().unwrap_or(true)
} else if v.is_int() { } else if v.is_int() {
v.to_int().unwrap_or(1) != 0 v.to_int().unwrap_or(1) != 0
} else if v.is_object() {
if let Ok(obj) = v.try_into_object() {
if let Ok(bm) = from_js::<'_, BotMessage>(obj.context(), &obj) {
Box::pin(handle_botmessage(
bot.clone(),
db.clone(),
bm,
msg.clone(),
))
.await
.is_err()
} else {
true
}
} else {
true
}
} else { } else {
// falling back to propagation // falling back to propagation
true true
@ -199,6 +216,18 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery)
v.to_bool().unwrap_or(true) v.to_bool().unwrap_or(true)
} else if v.is_int() { } else if v.is_int() {
v.to_int().unwrap_or(1) != 0 v.to_int().unwrap_or(1) != 0
} else if v.is_object() {
if let Ok(obj) = v.try_into_object() {
if let Ok(bm) = from_js::<'_, BotMessage>(obj.context(), &obj) {
Box::pin(handle_callback(bot.clone(), db.clone(), bm, q.clone()))
.await
.is_err()
} else {
true
}
} else {
true
}
} else { } else {
// falling back to propagation // falling back to propagation
true true