From 0a78b9cc5b25866a0df2231f9bea71fbfc0aa975 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Mon, 25 Mar 2024 18:30:26 +0100
Subject: [PATCH] cli: Display correct merge author in rad patch show output

---
 radicle-cli/src/terminal/patch/timeline.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/radicle-cli/src/terminal/patch/timeline.rs b/radicle-cli/src/terminal/patch/timeline.rs
index 668e6e12..70931b16 100644
--- a/radicle-cli/src/terminal/patch/timeline.rs
+++ b/radicle-cli/src/terminal/patch/timeline.rs
@@ -81,12 +81,12 @@ impl<'a> Opened<'a> {
                 },
             )
         }));
-        updates.extend(patch.merges().filter_map(|(_, merge)| {
+        updates.extend(patch.merges().filter_map(|(nid, merge)| {
             if merge.revision == root {
                 Some((
                     merge.timestamp,
                     Update::Merged {
-                        author: Author::new(&revision.author().id, profile),
+                        author: Author::new(nid, profile),
                         merge: merge.clone(),
                     },
                 ))
@@ -157,7 +157,7 @@ enum RevisionEntry<'a> {
 
 impl<'a> RevisionEntry<'a> {
     fn from_revision(
-        patch: &Patch,
+        patch: &'a Patch,
         id: RevisionId,
         revision: &'a Revision,
         profile: &Profile,
@@ -171,12 +171,12 @@ impl<'a> RevisionEntry<'a> {
                 },
             )
         }));
-        updates.extend(patch.merges().filter_map(|(_, merge)| {
+        updates.extend(patch.merges().filter_map(|(nid, merge)| {
             if merge.revision == id {
                 Some((
                     merge.timestamp,
                     Update::Merged {
-                        author: Author::new(&revision.author().id, profile),
+                        author: Author::new(nid, profile),
                         merge: merge.clone(),
                     },
                 ))