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

return teloxide's Message struct in send_application_to_chat

Browse Source
This commit is contained in:
Akulij 2025-05-09 00:22:34 +03:00
parent 27a829b784
commit 729f0c3eea
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -468,7 +468,7 @@ async fn send_application_to_chat(
bot: &Bot, bot: &Bot,
db: &mut DB, db: &mut DB,
app: &Application<teloxide::types::User>, app: &Application<teloxide::types::User>,
) -> BotResult<()> { ) -> BotResult<Message> {
let chat_id: i64 = match db.get_literal_value("support_chat_id").await? { let chat_id: i64 = match db.get_literal_value("support_chat_id").await? {
Some(strcid) => match strcid.parse() { Some(strcid) => match strcid.parse() {
Ok(cid) => cid, Ok(cid) => cid,
@ -479,7 +479,7 @@ async fn send_application_to_chat(
app.from app.from
)) ))
.await; .await;
return Ok(()); return Err(BotError::BotLogicError(format!("somewhere in bots logic support_chat_id literal not stored as a number, got: {strcid}")));
} }
}, },
None => { None => {
@ -488,7 +488,9 @@ async fn send_application_to_chat(
app.from app.from
)) ))
.await; .await;
return Ok(()); return Err(BotError::AdminMisconfiguration(format!(
"admin forget to set support_chat_id"
)));
} }
}; };
let msg = match db.get_literal_value("application_format").await? { let msg = match db.get_literal_value("application_format").await? {
@ -504,13 +506,13 @@ async fn send_application_to_chat(
), ),
None => { None => {
notify_admin("format for support_chat_id is not set").await; notify_admin("format for support_chat_id is not set").await;
return Ok(()); return Err(BotError::AdminMisconfiguration(format!(
"admin forget to set application_format"
)));
} }
}; };
bot.send_message(ChatId(chat_id), msg).await?; Ok(bot.send_message(ChatId(chat_id), msg).await?)
Ok(())
} }
/// This is an emergent situation function, so it should not return any Result, but handle Results /// This is an emergent situation function, so it should not return any Result, but handle Results