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

return chat and message id in answer message

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

13
src/main.rs
View File

@ -824,7 +824,7 @@ async fn answer_message<RM: Into<ReplyMarkup>>(
db: &mut DB, db: &mut DB,
literal: &str, literal: &str,
keyboard: Option<RM>, keyboard: Option<RM>,
) -> BotResult<()> { ) -> BotResult<(i64, i32)> {
answer_message_varianted(bot, chat_id, db, literal, None, keyboard).await answer_message_varianted(bot, chat_id, db, literal, None, keyboard).await
} }
@ -835,7 +835,7 @@ async fn answer_message_varianted<RM: Into<ReplyMarkup>>(
literal: &str, literal: &str,
variant: Option<&str>, variant: Option<&str>,
keyboard: Option<RM>, keyboard: Option<RM>,
) -> BotResult<()> { ) -> BotResult<(i64, i32)> {
answer_message_varianted_silence_flag(bot, chat_id, db, literal, variant, false, keyboard).await answer_message_varianted_silence_flag(bot, chat_id, db, literal, variant, false, keyboard).await
} }
@ -847,7 +847,7 @@ async fn answer_message_varianted_silence_flag<RM: Into<ReplyMarkup>>(
variant: Option<&str>, variant: Option<&str>,
silence_non_variant: bool, silence_non_variant: bool,
keyboard: Option<RM>, keyboard: Option<RM>,
) -> BotResult<()> { ) -> BotResult<(i64, i32)> {
let variant_text = match variant { let variant_text = match variant {
Some(variant) => { Some(variant) => {
let value = db.get_literal_alternative_value(literal, variant).await?; let value = db.get_literal_alternative_value(literal, variant).await?;
@ -985,7 +985,7 @@ async fn answer_message_varianted_silence_flag<RM: Into<ReplyMarkup>>(
} }
None => db.set_message_literal(chat_id, msg_id, literal).await?, None => db.set_message_literal(chat_id, msg_id, literal).await?,
}; };
Ok(()) Ok((chat_id, msg_id))
} }
async fn replace_message( async fn replace_message(
@ -1030,7 +1030,7 @@ async fn replace_message(
{ {
// fallback to sending message // fallback to sending message
warn!("Fallback into sending message instead of editing because it contains media"); warn!("Fallback into sending message instead of editing because it contains media");
return answer_message_varianted_silence_flag( answer_message_varianted_silence_flag(
bot, bot,
chat_id, chat_id,
db, db,
@ -1039,7 +1039,8 @@ async fn replace_message(
true, true,
keyboard, keyboard,
) )
.await; .await?;
return Ok(());
} }
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
}; };