dev #25

Merged
akulij merged 38 commits from dev into main 2025-06-18 17:10:44 +00:00
Showing only changes of commit 0c1ab767d3 - Show all commits

View File

@ -17,6 +17,7 @@ use db::bots::BotInstance;
use db::callback_info::CallbackInfo; use db::callback_info::CallbackInfo;
use handlers::admin::admin_handler; use handlers::admin::admin_handler;
use log::{error, info}; use log::{error, info};
use message_answerer::MessageAnswererError;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use crate::db::{CallDB, DB}; use crate::db::{CallDB, DB};
@ -145,6 +146,7 @@ pub enum BotError {
ScriptError(#[from] ScriptError), ScriptError(#[from] ScriptError),
IoError(#[from] std::io::Error), IoError(#[from] std::io::Error),
RwLockError(String), RwLockError(String),
MAError(#[from] MessageAnswererError),
} }
pub type BotResult<T> = Result<T, BotError>; pub type BotResult<T> = Result<T, BotError>;