From 748459483e7399fd704766debc6c07ee29a0d84e Mon Sep 17 00:00:00 2001
From: Magnus Hovland Hoff <maghoff@gmail.com>
Date: Tue, 2 Oct 2018 08:44:06 +0200
Subject: [PATCH] Show author for diffs that show only one changeset

---
 src/resources/diff_resource.rs | 70 +++++++++++++++++++++++-----------
 templates/diff.html            |  1 +
 2 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/src/resources/diff_resource.rs b/src/resources/diff_resource.rs
index 8d2591c..7088a74 100644
--- a/src/resources/diff_resource.rs
+++ b/src/resources/diff_resource.rs
@@ -101,6 +101,8 @@ impl Resource for DiffResource {
         struct Template<'a> {
             consecutive: bool,
             article_id: u32,
+            author: Option<&'a str>,
+            author_link: &'a str,
             article_history_link: &'a str,
             from_link: &'a str,
             to_link: &'a str,
@@ -119,38 +121,60 @@ impl Resource for DiffResource {
 
         Box::new(head
             .and_then(move |head| {
+                let consecutive = self.to.revision - self.from.revision == 1;
+
+                let author = match consecutive {
+                    true => self.to.author.as_ref().map(|x| &**x),
+                    false => None,
+                };
+
+                let author_link = &format!("_changes{}",
+                    changes_resource::QueryParameters::default()
+                        .author(author.map(|x| x.to_owned()))
+                        .pagination(Pagination::After(self.from.sequence_number))
+                        .into_link()
+                );
+
+                let article_history_link = &format!("_changes{}",
+                    changes_resource::QueryParameters::default()
+                        .article_id(Some(self.from.article_id))
+                        .pagination(Pagination::After(self.from.sequence_number))
+                        .into_link()
+                );
+
+                let title = &diff::chars(&self.from.title, &self.to.title)
+                    .into_iter()
+                    .map(|x| match x {
+                        diff::Result::Left(x) => Diff { removed: Some(x), ..Default::default() },
+                        diff::Result::Both(x, _) => Diff { same: Some(x), ..Default::default() },
+                        diff::Result::Right(x) => Diff { added: Some(x), ..Default::default() },
+                    })
+                    .collect::<Vec<_>>();
+
+                let lines = &diff::lines(&self.from.body, &self.to.body)
+                    .into_iter()
+                    .map(|x| match x {
+                        diff::Result::Left(x) => Diff { removed: Some(x), ..Default::default() },
+                        diff::Result::Both(x, _) => Diff { same: Some(x), ..Default::default() },
+                        diff::Result::Right(x) => Diff { added: Some(x), ..Default::default() },
+                    })
+                    .collect::<Vec<_>>();
+
                 Ok(head
                     .with_body(Layout {
                         base: Some("../"), // Hmm, should perhaps accept `base` as argument
                         title: "Difference",
                         theme: theme::theme_from_str_hash("Difference"),
                         body: &Template {
-                            consecutive: self.to.revision - self.from.revision == 1,
+                            consecutive,
                             article_id: self.from.article_id as u32,
-                            article_history_link: &format!("_changes{}",
-                                changes_resource::QueryParameters::default()
-                                    .article_id(Some(self.from.article_id))
-                                    .pagination(Pagination::After(self.from.sequence_number))
-                                    .into_link()
-                            ),
+                            author,
+                            author_link,
+                            article_history_link,
                             from_link: &format!("_revisions/{}/{}", self.from.article_id, self.from.revision),
                             to_link: &format!("_revisions/{}/{}", self.to.article_id, self.to.revision),
-                            title: &diff::chars(&self.from.title, &self.to.title)
-                                .into_iter()
-                                .map(|x| match x {
-                                    diff::Result::Left(x) => Diff { removed: Some(x), ..Default::default() },
-                                    diff::Result::Both(x, _) => Diff { same: Some(x), ..Default::default() },
-                                    diff::Result::Right(x) => Diff { added: Some(x), ..Default::default() },
-                                })
-                                .collect::<Vec<_>>(),
-                            lines: &diff::lines(&self.from.body, &self.to.body)
-                                .into_iter()
-                                .map(|x| match x {
-                                    diff::Result::Left(x) => Diff { removed: Some(x), ..Default::default() },
-                                    diff::Result::Both(x, _) => Diff { same: Some(x), ..Default::default() },
-                                    diff::Result::Right(x) => Diff { added: Some(x), ..Default::default() },
-                                })
-                                .collect::<Vec<_>>()
+                            title,
+                            lines,
                         },
                     }.to_string()))
             }))
diff --git a/templates/diff.html b/templates/diff.html
index b62958d..e22a8d2 100644
--- a/templates/diff.html
+++ b/templates/diff.html
@@ -10,6 +10,7 @@
     <p>
         You are viewing the difference between two {{#consecutive?}}consecutive{{/consecutive}}
         revisions of <a href="_by_id/{{article_id}}">this article</a>.
+        {{#author}}This changeset was authored by <a href="{{..author_link}}">{{.}}</a>{{/author}}.
     </p>
 
     <p>