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

access RunnerConfig instead of manually using commands hash map

Browse Source
This commit is contained in:
Akulij 2025-05-23 16:29:54 +05:00
parent 1ff86f641f
commit e8dbf3db76
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -12,7 +12,6 @@ use db::callback_info::CallbackInfo;
use db::message_forward::MessageForward; use db::message_forward::MessageForward;
use itertools::Itertools; use itertools::Itertools;
use log::{error, info, warn}; use log::{error, info, warn};
use std::collections::HashMap;
use std::str::FromStr; use std::str::FromStr;
use std::sync::RwLock; use std::sync::RwLock;
use std::time::Duration; use std::time::Duration;
@ -169,8 +168,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
} }
} }
// //
let cmdmap: std::sync::Arc<RwLock<HashMap<_, _>>> = let rc: std::sync::Arc<RwLock<RunnerConfig>> = std::sync::Arc::new(RwLock::new(bc.rc));
std::sync::Arc::new(RwLock::new(bc.rc.dialog.commands));
let handler = dptree::entry() let handler = dptree::entry()
.inspect(|u: Update| { .inspect(|u: Update| {
@ -180,11 +178,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
Update::filter_message() Update::filter_message()
.filter_map(|m: Message| m.text().and_then(|t| BotCommand::from_str(t).ok())) .filter_map(|m: Message| m.text().and_then(|t| BotCommand::from_str(t).ok()))
.filter_map(move |bc: BotCommand| { .filter_map(move |bc: BotCommand| {
let rc = std::sync::Arc::clone(&cmdmap); let rc = std::sync::Arc::clone(&rc);
let command = bc.command();
let cmdmap = rc.read().expect("RwLock lock on commands map failed"); let rc = rc.read().expect("RwLock lock on commands map failed");
cmdmap.get(bc.command()).cloned() rc.get_command_message(command)
}) })
.endpoint(botscript_command_handler), .endpoint(botscript_command_handler),
) )