X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb93fccf0690344aa77f9538a508959a6de09847..876808568e677a527acf3fd6e0812e99412fed84:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 6184c6031..1c10417c3 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::comments;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 use POSIX qw(strftime);
 
@@ -16,6 +16,7 @@ use constant POST_COMMENT => "Post comment";
 use constant CANCEL => "Cancel";
 
 my $postcomment;
+my %commentstate;
 
 sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
@@ -34,29 +35,24 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
-		# Pages where comments are shown, but new comments are not
-		# allowed, will show "Comments are closed".
-		comments_shown_pagespec => {
+		comments_pagespec => {
 			type => 'pagespec',
-			example => 'blog/*',
-			default => '',
-			description => 'PageSpec for pages where comments will be shown inline',
+			example => 'blog/* and !*/Discussion',
+			description => 'PageSpec of pages where comments are allowed',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 1,
 		},
-		comments_open_pagespec => {
+		comments_closed_pagespec => {
 			type => 'pagespec',
-			example => 'blog/* and created_after(close_old_comments)',
-			default => '',
-			description => 'PageSpec for pages where new comments can be posted',
+			example => 'blog/controversial or blog/flamewar',
+			description => 'PageSpec of pages where posting new comments is not allowed',
 			link => 'ikiwiki/PageSpec',
 			safe => 1,
 			rebuild => 1,
 		},
 		comments_pagename => {
 			type => 'string',
-			example => 'comment_',
 			default => 'comment_',
 			description => 'Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"',
 			safe => 0, # manual page moving required
@@ -64,7 +60,6 @@ sub getsetup () {
 		},
 		comments_allowdirectives => {
 			type => 'boolean',
-			default => 0,
 			example => 0,
 			description => 'Interpret directives in comments?',
 			safe => 1,
@@ -72,7 +67,6 @@ sub getsetup () {
 		},
 		comments_allowauthor => {
 			type => 'boolean',
-			default => 0,
 			example => 0,
 			description => 'Allow anonymous commenters to set an author name?',
 			safe => 1,
@@ -81,7 +75,6 @@ sub getsetup () {
 		comments_commit => {
 			type => 'boolean',
 			example => 1,
-			default => 1,
 			description => 'commit comments to the VCS',
 			# old uncommitted comments are likely to cause
 			# confusion if this is changed
@@ -90,6 +83,17 @@ sub getsetup () {
 		},
 }
 
+sub checkconfig () {
+	$config{comments_commit} = 1
+		unless defined $config{comments_commit};
+	$config{comments_pagespec} = ''
+		unless defined $config{comments_pagespec};
+	$config{comments_closed_pagespec} = ''
+		unless defined $config{comments_closed_pagespec};
+	$config{comments_pagename} = 'comment_'
+		unless defined $config{comments_pagename};
+}
+
 sub htmlize {
 	my %params = @_;
 	return $params{content};
@@ -148,11 +152,27 @@ sub preprocess {
 	my $commentip;
 	my $commentauthor;
 	my $commentauthorurl;
-
+	my $commentopenid;
 	if (defined $params{username}) {
 		$commentuser = $params{username};
-		($commentauthorurl, $commentauthor) =
-			linkuser($params{username});
+
+		my $oiduser = eval { IkiWiki::openiduser($commentuser) };
+
+		if (defined $oiduser) {
+			# looks like an OpenID
+			$commentauthorurl = $commentuser;
+			$commentauthor = $oiduser;
+			$commentopenid = $commentuser;
+		}
+		else {
+			$commentauthorurl = IkiWiki::cgiurl(
+				do => 'commenter',
+				page => (length $config{userdir}
+					? "$config{userdir}/$commentuser"
+					: "$commentuser"));
+
+			$commentauthor = $commentuser;
+		}
 	}
 	else {
 		if (defined $params{ip}) {
@@ -161,10 +181,11 @@ sub preprocess {
 		$commentauthor = gettext("Anonymous");
 	}
 
-	$pagestate{$page}{comments}{commentuser} = $commentuser;
-	$pagestate{$page}{comments}{commentip} = $commentip;
-	$pagestate{$page}{comments}{commentauthor} = $commentauthor;
-	$pagestate{$page}{comments}{commentauthorurl} = $commentauthorurl;
+	$commentstate{$page}{commentuser} = $commentuser;
+	$commentstate{$page}{commentopenid} = $commentopenid;
+	$commentstate{$page}{commentip} = $commentip;
+	$commentstate{$page}{commentauthor} = $commentauthor;
+	$commentstate{$page}{commentauthorurl} = $commentauthorurl;
 	if (! defined $pagestate{$page}{meta}{author}) {
 		$pagestate{$page}{meta}{author} = $commentauthor;
 	}
@@ -177,8 +198,17 @@ sub preprocess {
 			$pagestate{$page}{meta}{author} = $params{claimedauthor};
 		}
 
-		if (defined $params{url} and safeurl($params{url})) {
-			$pagestate{$page}{meta}{authorurl} = $params{url};
+		if (defined $params{url}) {
+			my $url=$params{url};
+
+			eval q{use URI::Heuristic}; 
+		  	if (! $@) {
+				$url=URI::Heuristic::uf_uristr($url);
+			}
+
+			if (safeurl($url)) {
+				$pagestate{$page}{meta}{authorurl} = $url;
+			}
 		}
 	}
 	else {
@@ -190,12 +220,10 @@ sub preprocess {
 		$pagestate{$page}{meta}{title} = $params{subject};
 	}
 
-	my $baseurl = urlto($params{destpage}, undef, 1);
-	my $anchor = "";
 	if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) {
-		$anchor = $1;
+		$pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1).
+			"#".$params{page};
 	}
-	$pagestate{$page}{meta}{permalink} = "${baseurl}#${anchor}";
 
 	eval q{use Date::Parse};
 	if (! $@) {
@@ -203,17 +231,9 @@ sub preprocess {
 		$IkiWiki::pagectime{$page} = $time if defined $time;
 	}
 
-	# FIXME: hard-coded HTML (although it's just to set an ID)
-	return "<div id=\"$anchor\">$content</div>" if $anchor;
 	return $content;
 }
 
-sub checkconfig () {
-	$config{comments_commit} = 1 unless defined $config{comments_commit};
-	$config{comments_pagename} = 'comment_'
-		unless defined $config{comments_pagename};
-}
-
 # This is exactly the same as recentchanges_link :-(
 sub linkcgi ($) {
 	my $cgi=shift;
@@ -243,27 +263,6 @@ sub linkcgi ($) {
 	}
 }
 
-# FIXME: basically the same logic as recentchanges
-# returns (author URL, pretty-printed version)
-sub linkuser ($) {
-	my $user = shift;
-	my $oiduser = eval { IkiWiki::openiduser($user) };
-
-	if (defined $oiduser) {
-		return ($user, $oiduser);
-	}
-	# FIXME: it'd be good to avoid having such a link for anonymous
-	# posts
-	else {
-		return (IkiWiki::cgiurl(
-				do => 'commenter',
-				page => (length $config{userdir}
-					? "$config{userdir}/$user"
-					: "$user")
-			), $user);
-	}
-}
-
 # Mostly cargo-culted from IkiWiki::plugin::editpage
 sub sessioncgi ($$) {
 	my $cgi=shift;
@@ -288,9 +287,7 @@ sub sessioncgi ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		table => 0,
-		template => scalar IkiWiki::template_params('comments_form.tmpl'),
-		# wtf does this do in editpage?
-		wikiname => $config{wikiname},
+		template => scalar IkiWiki::template_params('editcomment.tmpl'),
 	);
 
 	IkiWiki::decode_form_utf8($form);
@@ -372,7 +369,7 @@ sub sessioncgi ($$) {
 			$page));
 	}
 
-	if (not pagespec_match($page, $config{comments_open_pagespec},
+	if (pagespec_match($page, $config{comments_closed_pagespec},
 		location => $page)) {
 		error(sprintf(gettext(
 			"comments on page '%s' are closed"),
@@ -444,8 +441,8 @@ sub sessioncgi ($$) {
 
 	if ($form->submitted eq PREVIEW) {
 		my $preview = IkiWiki::htmlize($location, $page, '_comment',
-				IkiWiki::linkify($page, $page,
-					IkiWiki::preprocess($page, $page,
+				IkiWiki::linkify($location, $page,
+					IkiWiki::preprocess($location, $page,
 						IkiWiki::filter($location,
 							$page, $content),
 						0, 1)));
@@ -454,11 +451,17 @@ sub sessioncgi ($$) {
 					content => $preview);
 			});
 
-		my $template = template("comments_display.tmpl");
+		my $template = template("comment.tmpl");
 		$template->param(content => $preview);
 		$template->param(title => $form->field('subject'));
 		$template->param(ctime => displaytime(time));
 
+		IkiWiki::run_hooks(pagetemplate => sub {
+			shift->(page => $location,
+				destpage => $page,
+				template => $template);
+		});
+
 		$form->tmpl_param(page_preview => $template->output);
 	}
 	else {
@@ -502,9 +505,11 @@ sub sessioncgi ($$) {
 		# breaks it or something
 		error($conflict) if defined $conflict;
 
-		# Bounce back to where we were, but defeat broken caches
-		my $anticache = "?updated=$page/$config{comments_pagename}$i";
-		IkiWiki::redirect($cgi, urlto($page, undef, 1).$anticache);
+		# Jump to the new comment on the page.
+		# The trailing question mark tries to avoid broken
+		# caches and get the most recent version of the page.
+		IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location?updated");
+
 	}
 	else {
 		IkiWiki::showform ($form, \@buttons, $session, $cgi,
@@ -514,36 +519,41 @@ sub sessioncgi ($$) {
 	exit;
 }
 
+sub commentsshown ($) {
+	my $page=shift;
+
+	return ! pagespec_match($page, "*/$config{comments_pagename}*",
+	                        location => $page) &&
+	       pagespec_match($page, $config{comments_pagespec},
+	                      location => $page);
+}
+
+sub commentsopen ($) {
+	my $page = shift;
+
+	return length $config{cgiurl} > 0 &&
+	       (! length $config{comments_closed_pagespec} ||
+	        ! pagespec_match($page, $config{comments_closed_pagespec},
+	                         location => $page));
+}
+
 sub pagetemplate (@) {
 	my %params = @_;
 
 	my $page = $params{page};
 	my $template = $params{template};
+	my $shown = ($template->query(name => 'commentslink') ||
+	             $template->query(name => 'commentsurl') ||
+	             $template->query(name => 'atomcommentsurl') ||
+	             $template->query(name => 'comments')) &&
+	            commentsshown($page);
 
 	if ($template->query(name => 'comments')) {
 		my $comments = undef;
-
-		my $open = 0;
-		my $shown = pagespec_match($page,
-			$config{comments_shown_pagespec},
-			location => $page);
-
-		if (pagespec_match($page, "*/$config{comments_pagename}*",
-				location => $page)) {
-			$shown = 0;
-			$open = 0;
-		}
-
-		if (length $config{cgiurl}) {
-			$open = pagespec_match($page,
-				$config{comments_open_pagespec},
-				location => $page);
-		}
-
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
 				pages => "internal($page/$config{comments_pagename}*)",
-				template => 'comments_display',
+				template => 'comment',
 				show => 0,
 				reverse => 'yes',
 				page => $page,
@@ -557,31 +567,66 @@ sub pagetemplate (@) {
 			$template->param(comments => $comments);
 		}
 
-		if ($open) {
-			my $commenturl = IkiWiki::cgiurl(do => 'comment',
+		if ($shown && commentsopen($page)) {
+			my $addcommenturl = IkiWiki::cgiurl(do => 'comment',
 				page => $page);
-			$template->param(commenturl => $commenturl);
+			$template->param(addcommenturl => $addcommenturl);
+		}
+	}
+
+	if ($template->query(name => 'commentsurl')) {
+		if ($shown) {
+			$template->param(commentsurl =>
+				urlto($page, undef, 1).'#comments');
+		}
+	}
+
+	if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) {
+		if ($shown) {
+			# This will 404 until there are some comments, but I
+			# think that's probably OK...
+			$template->param(atomcommentsurl =>
+				urlto($page, undef, 1).'comments.atom');
+		}
+	}
+
+	if ($template->query(name => 'commentslink')) {
+		# XXX Would be nice to say how many comments there are in
+		# the link. But, to update the number, blog pages
+		# would have to update whenever comments of any inlines
+		# page are added, which is not currently done.
+		if ($shown) {
+			$template->param(commentslink =>
+				htmllink($page, $params{destpage}, $page,
+					linktext => gettext("Comments"),
+					anchor => "comments",
+					noimageinline => 1));
 		}
 	}
 
 	if ($template->query(name => 'commentuser')) {
 		$template->param(commentuser =>
-			$pagestate{$page}{comments}{commentuser});
+			$commentstate{$page}{commentuser});
+	}
+
+	if ($template->query(name => 'commentopenid')) {
+		$template->param(commentopenid =>
+			$commentstate{$page}{commentopenid});
 	}
 
 	if ($template->query(name => 'commentip')) {
 		$template->param(commentip =>
-			$pagestate{$page}{comments}{commentip});
+			$commentstate{$page}{commentip});
 	}
 
 	if ($template->query(name => 'commentauthor')) {
 		$template->param(commentauthor =>
-			$pagestate{$page}{comments}{commentauthor});
+			$commentstate{$page}{commentauthor});
 	}
 
 	if ($template->query(name => 'commentauthorurl')) {
 		$template->param(commentauthorurl =>
-			$pagestate{$page}{comments}{commentauthorurl});
+			$commentstate{$page}{commentauthorurl});
 	}
 }