Update blogspam to the 2.0 API.

[backport to Debian wheezy, open-coding a simple version of useragent() -smcv]

Conflicts:
	IkiWiki/Plugin/blogspam.pm
	debian/changelog

diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index d32c2f169d643a7db9e9fffc292201a4bf93276e..abd289a15787dcf22aa9660df194886a4fa4f257 100644 (file)
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -6,7 +6,8 @@ use strict;
 use IkiWiki 3.00;
 use Encode;
 
-my $defaulturl='http://test.blogspam.net:8888/';
+my $defaulturl='http://test.blogspam.net:9999/';
+my $client;
 
 sub import {
        hook(type => "getsetup", id => "blogspam",  call => \&getsetup);
@@ -33,14 +34,14 @@ sub getsetup () {
                        type => "string",
                        example => "blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10",
                        description => "options to send to blogspam server",
-                       link => "http://blogspam.net/api/testComment.html#options",
+                       link => "http://blogspam.net/api/2.0/testComment.html#options",
                        safe => 1,
                        rebuild => 0,
                },
                blogspam_server => {
                        type => "string",
                        default => $defaulturl,
-                       description => "blogspam server XML-RPC url",
+                       description => "blogspam server JSON url",
                        safe => 1,
                        rebuild => 0,
                },
@@ -51,10 +52,23 @@ sub checkconfig () {
        # if the module is missing when a spam is posted would not
        # let the admin know about the problem.
        eval q{
-               use RPC::XML;
-               use RPC::XML::Client;
+               use JSON;
+               use HTTP::Request;
        };
        error $@ if $@;
+
+       eval q{use LWPx::ParanoidAgent};
+       if (!$@) {
+               $client=LWPx::ParanoidAgent->new();
+       }
+       else {
+               eval q{use LWP};
+               if ($@) {
+                       error $@;
+                       return;
+               }
+               $client=LWP::UserAgent->new(cookie_jar => $config{cookiejar});
+       }
 }
 
 sub checkcontent (@) {
@@ -76,8 +90,6 @@ sub checkcontent (@) {
        my $url=$defaulturl;
        $url = $config{blogspam_server} if exists $config{blogspam_server};
 
-       my $client = RPC::XML::Client->new($url);
-
        my @options = split(",", $config{blogspam_options})
                if exists $config{blogspam_options};
 
@@ -106,19 +118,28 @@ sub checkcontent (@) {
                site => encode_utf8($config{url}),
                version => "ikiwiki ".$IkiWiki::version,
        );
-       my $res = $client->send_request('testComment', \%req);
+       eval q{use JSON; use HTTP::Request}; # errors handled in checkconfig()
+       my $res = $client->request(
+               HTTP::Request->new(
+                       'POST',
+                       $url,
+                       [ 'Content-Type' => 'application/json' ],
+                       to_json(\%req),
+               ),
+       );
 
-       if (! ref $res || ! defined $res->value) {
+       if (! ref $res || ! $res->is_success()) {
                debug("failed to get response from blogspam server ($url)");
                return undef;
        }
-       elsif ($res->value =~ /^SPAM:(.*)/) {
+       my $details = from_json($res->content);
+       if ($details->{result} eq 'SPAM') {
                eval q{use Data::Dumper};
-               debug("blogspam server reports ".$res->value.": ".Dumper(\%req));
-               return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$1;
+               debug("blogspam server reports $details->{reason}: ".Dumper(\%req));
+               return gettext("Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: ").$details->{reason};
        }
-       elsif ($res->value ne 'OK') {
-               debug("blogspam server failure: ".$res->value);
+       elsif ($details->{result} ne 'OK') {
+               debug("blogspam server failure: ".$res->content);
                return undef;
        }
        else {

diff --git a/debian/changelog b/debian/changelog
index 98b38d84bb9e1217d5df5867b182a611f725a411..49fd8146c13248d3f441702ba764c7a737f030ee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 ikiwiki (3.20120629.1) UNRELEASED; urgency=medium
 
+  [ Joey Hess ]
   * Set Debian package maintainer to Simon McVittie as I'm retiring from
     Debian.
 
+  [ Amitai Schlair ]
+  * blogspam: use the 2.0 JSON API (the 1.0 XML-RPC API has been EOL'd).
+
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400
 
 ikiwiki (3.20120629) unstable; urgency=low