From f6a5a42b71364928cdb9c6dcee014ac938276eaa Mon Sep 17 00:00:00 2001 From: Akulij Date: Sat, 7 Jun 2025 02:52:37 +0500 Subject: [PATCH] propagate error instead of unwrap in bot_handler.rs --- src/bot_handler.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bot_handler.rs b/src/bot_handler.rs index de2238f..a7930cb 100644 --- a/src/bot_handler.rs +++ b/src/bot_handler.rs @@ -15,7 +15,7 @@ use teloxide::{ }; use crate::{ - botscript::{self, message_info::MessageInfoBuilder, BotMessage}, + botscript::{self, message_info::MessageInfoBuilder, BotMessage, ScriptError}, commands::BotCommand, db::{callback_info::CallbackInfo, CallDB, DB}, message_answerer::MessageAnswerer, @@ -121,11 +121,11 @@ async fn handle_botmessage(bot: Bot, mut db: DB, bm: BotMessage, msg: Message) - // falling back to propagation 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() .set_variant(variant.clone()) .build(); - let mi = to_js(ctx, &mi).unwrap(); + let mi = to_js(ctx, &mi).map_err(ScriptError::from)?; info!( "Calling handler {:?} with msg literal: {:?}", handler, @@ -215,9 +215,9 @@ async fn handle_callback(bot: Bot, mut db: DB, bm: BotMessage, q: CallbackQuery) // falling back to propagation 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 = to_js(ctx, &mi).unwrap(); + let mi = to_js(ctx, &mi).map_err(ScriptError::from)?; match handler.call_args(vec![jsuser, mi]) { Ok(v) => { if v.is_bool() {