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

fix logic: move bot insertion to db to /deploy command, instead of function in bot_manager

Browse Source
This commit is contained in:
Akulij 2025-05-31 10:45:34 +05:00
parent f27fb670bd
commit 6dfe9b839d
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/admin.rs
View File

@ -1,5 +1,3 @@
use std::fmt::format;
use itertools::Itertools;
use teloxide::{
prelude::*,
@ -7,8 +5,8 @@ use teloxide::{
};
use crate::{
bot_manager::create_bot,
db::{CallDB, DB},
bot_manager::DEFAULT_SCRIPT,
db::{bots::BotInstance, CallDB, DB},
BotResult,
};
use crate::{BotDialogue, LogMsg, State};
@ -162,7 +160,27 @@ pub async fn admin_command_handler(
Ok(())
}
AdminCommands::Deploy { token } => {
let bot_instance = create_bot(&mut db, &token).await?;
let bot_instance = {
let botnew = Bot::new(&token);
let name = match botnew.get_me().await {
Ok(me) => me.username().to_string(),
Err(teloxide::RequestError::Api(teloxide::ApiError::InvalidToken)) => {
bot.send_message(msg.chat.id, "Error: bot token is invalid")
.await?;
return Ok(());
}
Err(err) => {
return Err(err.into());
}
};
let bi =
BotInstance::new(name.clone(), token.to_string(), DEFAULT_SCRIPT.to_string())
.store(&mut db)
.await?;
bi
};
bot.send_message(
msg.chat.id,

11
src/bot_manager.rs
View File

@ -169,17 +169,6 @@ async fn script_handler_gen(c: BotController, plug_handlers: Vec<BotHandler>) ->
handler
}
pub async fn create_bot(db: &mut DB, token: &str) -> BotResult<BotInstance> {
let bot = Bot::new(token);
let name = bot.get_me().await?.username().to_string();
let bi = BotInstance::new(name.clone(), token.to_string(), DEFAULT_SCRIPT.to_string())
.store(db)
.await?;
Ok(bi)
}
pub async fn start_bot(
bi: BotInstance,
db: &mut DB,