From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Wed, 17 Jul 2013 20:38:08 +0000 (-0400)
Subject: Show author in addition to feedname, if different.
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/97d0c09a18d9c9b1defb3f4849e04e06745000c7

Show author in addition to feedname, if different.

While here, mollify http://validator.w3.org/feed/ and
s/dcterms:creator/dc:creator/g, which happens to make rss2email see
and do nice things with authors.
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 89da5c453..be6e8d476 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -593,6 +593,7 @@ sub aggregate (@) {
 				feed => $feed,
 				copyright => $f->copyright,
 				title => defined $entry->title ? decode_entities($entry->title) : "untitled",
+				author => defined $entry->author ? decode_entities($entry->author) : "",
 				link => $entry->link,
 				content => (defined $c && defined $c->body) ? $c->body : "",
 				guid => defined $entry->id ? $entry->id : time."_".$feed->{name},
@@ -690,6 +691,9 @@ sub write_page ($$$$$) {
 	}
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
+	$template->param(author => $params{author})
+		if defined $params{author} && length($params{author}
+			&& $params{author} ne $feed->{name});
 	$template->param(content => wikiescape(htmlabs($params{content},
 		defined $params{base} ? $params{base} : $feed->{feedurl})));
 	$template->param(name => $feed->{name});
diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 4e89efe32..a89ccfcdf 100644
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -11,5 +11,9 @@
 <TMPL_IF COPYRIGHT>
 [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
+<TMPL_IF AUTHOR>
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
+<TMPL_ELSE>
 [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+</TMPL_IF>
 [[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 9acefb5d3..bb03ca5bc 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -7,7 +7,7 @@
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
 <TMPL_IF AUTHOR>
-	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
+	<dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
 </TMPL_IF>
 <TMPL_IF CATEGORIES>
 <TMPL_LOOP CATEGORIES>