From 40d9a1ec224154364d0d62b75cf748b5de8bf943 Mon Sep 17 00:00:00 2001 From: link2xt Date: Fri, 12 Feb 2021 01:11:59 +0300 Subject: [PATCH] Do not return quoted messages from the trash chat --- src/message.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/message.rs b/src/message.rs index b750b52b6..74b8254f2 100644 --- a/src/message.rs +++ b/src/message.rs @@ -877,7 +877,13 @@ impl Message { if self.param.get(Param::Quote).is_some() { if let Some(in_reply_to) = &self.in_reply_to { if let Some((_, _, msg_id)) = rfc724_mid_exists(context, in_reply_to).await? { - return Ok(Some(Message::load_from_db(context, msg_id).await?)); + let msg = Message::load_from_db(context, msg_id).await?; + return if msg.chat_id.is_trash() { + // If message is already moved to trash chat, pretend it does not exist. + Ok(None) + } else { + Ok(Some(msg)) + }; } } }