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

17
src/bot_handler.rs
View File

@ -69,7 +69,7 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
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?;
if bm.meta() == true { let variant = if bm.meta() == true {
let meta = match BotCommand::from_str(msg.text().unwrap_or("")) { let meta = match BotCommand::from_str(msg.text().unwrap_or("")) {
Ok(cmd) => cmd.args().map(|m| m.to_string()), Ok(cmd) => cmd.args().map(|m| m.to_string()),
Err(err) => { Err(err) => {
@ -78,10 +78,14 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
} }
}; };
if let Some(meta) = meta { if let Some(ref meta) = meta {
user.insert_meta(&mut db, &meta).await?; user.insert_meta(&mut db, meta).await?;
} };
}
meta
} else {
None
};
let is_propagate: bool = match bm.get_handler() { let is_propagate: bool = match bm.get_handler() {
Some(handler) => 'prop: { Some(handler) => 'prop: {
@ -143,7 +147,8 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) -
let literal = bm.literal().map_or("", |s| s.as_str()); let literal = bm.literal().map_or("", |s| s.as_str());
let ma = MessageAnswerer::new(&bot, &mut db, msg.chat.id.0); let ma = MessageAnswerer::new(&bot, &mut db, msg.chat.id.0);
ma.answer(literal, None, buttons).await?; ma.answer(literal, variant.as_ref().map(|v| v.as_str()), buttons)
.await?;
Ok(()) Ok(())
} }