Skip to content

Show placeholder if replied to message is not loaded #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Show placeholder if replied to message is not loaded #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/message/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,17 +1010,28 @@ impl Message {
let width = fmt.width();

// Show the message that this one replied to, if any.
let reply = self
.reply_to()
.or_else(|| self.thread_root())
.and_then(|e| info.get_event(&e));
let reply = self.reply_to().or_else(|| self.thread_root()).map(|e| info.get_event(&e));
let proto_reply = reply.as_ref().and_then(|r| {
// Format the reply header, push it into the `Text` buffer, and get any image.
fmt.push_in_reply(r, style, &mut text, info, settings)
if let Some(r) = r {
// Format the reply header, push it into the `Text` buffer, and get any image.
fmt.push_in_reply(r, style, &mut text, info, settings)
} else {
fmt.push_spans(
Line::from(vec![
Span::styled(" ", style),
Span::styled(THICK_VERTICAL, style),
Span::styled("Original message not loaded", style),
space_span(width.saturating_sub(29), style),
]),
style,
&mut text,
);
None
}
});

// Now show the message contents, and the inlined reply if we couldn't find it above.
let (msg, proto) = self.show_msg(width, style, reply.is_some(), settings);
let (msg, proto) = self.show_msg(width, style, true, settings);

// Given our text so far, determine the image offset.
let proto_main = proto.map(|p| {
Expand Down
Loading