From 82941440b99c9f8f85b654004392e3cb1a4e1e76 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <me@sebastinez.dev>
Date: Mon, 3 Jul 2023 22:44:56 +0200
Subject: [PATCH] Replace patch author with revision author in Revision
 component

Signed-off-by: Sebastian Martinez <me@sebastinez.dev>
---
 src/views/projects/Cob/Revision.svelte | 10 ++++++----
 src/views/projects/Patch.svelte        |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/projects/Cob/Revision.svelte b/src/views/projects/Cob/Revision.svelte
index c07164b9f..aad8d1f3a 100644
--- a/src/views/projects/Cob/Revision.svelte
+++ b/src/views/projects/Cob/Revision.svelte
@@ -22,8 +22,6 @@
   import ProjectLink from "@app/components/ProjectLink.svelte";
   import Thread from "@app/components/Thread.svelte";
 
-  export let authorId: string;
-  export let authorAlias: string | undefined = undefined;
   export let baseUrl: BaseUrl;
   export let expanded: boolean = true;
   export let patchId: string;
@@ -34,6 +32,7 @@
   export let revisionId: string;
   export let revisionOid: string;
   export let revisionTimestamp: number;
+  export let revisionAuthor: { id: string; alias?: string | undefined };
   export let timelines: Timeline[];
   export let previousRevId: string | undefined = undefined;
   export let previousRevOid: string | undefined = undefined;
@@ -287,7 +286,10 @@
             </div>
           {/if}
           <div class="action txt-tiny">
-            <Authorship {authorId} {authorAlias} timestamp={element.timestamp}>
+            <Authorship
+              authorId={revisionAuthor.id}
+              authorAlias={revisionAuthor.alias}
+              timestamp={element.timestamp}>
               {caption}
             </Authorship>
             {#if response?.commits}
@@ -299,7 +301,7 @@
                       <span class="commit-separator">
                         {i === 0 ? "╎" : "│"}
                       </span>
-                      <Avatar inline nodeId={authorId} />
+                      <Avatar inline nodeId={revisionAuthor.id} />
                       <ProjectLink
                         projectParams={{
                           view: { resource: "commits", commitId: commit.id },
diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte
index 2842b40ba..02633cf79 100644
--- a/src/views/projects/Patch.svelte
+++ b/src/views/projects/Patch.svelte
@@ -164,6 +164,7 @@
         revisionTimestamp: number;
         revisionBase: string;
         revisionOid: string;
+        revisionAuthor: { id: string; alias?: string | undefined };
       },
       Timeline[],
     ]
@@ -173,6 +174,7 @@
       revisionTimestamp: rev.timestamp,
       revisionBase: rev.base,
       revisionOid: rev.oid,
+      revisionAuthor: rev.author,
     },
     [
       ...rev.reviews.map<TimelineReview>(review => ({
@@ -445,8 +447,6 @@
             first={index === 0}
             on:reply={createReply}
             patchId={patch.id}
-            authorId={patch.author.id}
-            authorAlias={patch.author.alias}
             expanded={index === patch.revisions.length - 1}
             previousRevId={previousRevision?.id}
             previousRevOid={previousRevision?.oid} />