StNicolay/pass_manager
1
0
Fork 0
Code Issues Pull Requests Releases Activity

changed the way we set the markup in alter_message

Browse Source
This commit is contained in:
StNicolay 2023-08-07 01:21:15 +03:00
parent 3bc97d7bbc
commit 1cc486bdc5
Signed by: StNicolay
GPG Key ID: 9693D04DCD962B0D
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/state/handler.rs
View File

@ -32,11 +32,7 @@ impl MessageIds {
) -> crate::Result<()> { ) -> crate::Result<()> {
let mut edit = bot.edit_message_text(self.0, self.1, text); let mut edit = bot.edit_message_text(self.0, self.1, text);
edit.parse_mode = parse_mode.into(); edit.parse_mode = parse_mode.into();
edit.reply_markup = markup.into();
let mut markup = markup.into();
if let Some(markup) = markup {
edit = edit.reply_markup(markup)
}
match edit.send_ref().await { match edit.send_ref().await {
Ok(_) => return Ok(()), Ok(_) => return Ok(()),
@ -44,14 +40,10 @@ impl MessageIds {
Err(err) => return Err(err.into()), Err(err) => return Err(err.into()),
}; };
let text = mem::take(&mut edit.text); let mut send = bot.send_message(self.0, mem::take(&mut edit.text));
markup = mem::take(&mut edit.reply_markup); let payload = send.payload_mut();
payload.parse_mode = edit.parse_mode;
let mut send = bot.send_message(self.0, text); payload.reply_markup = mem::take(&mut edit.reply_markup).map(Into::into);
send.payload_mut().parse_mode = parse_mode.into();
if let Some(markup) = markup {
send = send.reply_markup(markup);
}
let msg = join!(self.delete(bot), send.send()).1?; let msg = join!(self.delete(bot), send.send()).1?;
*self = Self::from(&msg); *self = Self::from(&msg);