@@ -54,7 +54,7 @@ class Comment < Content akismet = Akismet.new(site.akismet_key, site.akismet_url) self.approved = !akismet.comment_check(comment_spam_options(site, request)) logger.info "Checking Akismet (#{site.akismet_key}) for new comment on Article #{article_id}. #{approved? ? 'Approved' : 'Blocked'}" - logger.warn "Odd Akismet Response: #{akismet.last_response.inspect}" unless %w(true false).include?(akismet.last_response) + logger.warn "Odd Akismet Response: #{akismet.last_response.inspect}" unless Akismet.normal_responses.include?(akismet.last_response) end end app/models/comment.rb @@ -10,9 +10,12 @@ require 'uri' # rewritten to be more rails-like class Akismet + cattr_accessor :valid_responses, :normal_responses attr_accessor :proxy_port, :proxy_host attr_reader :last_response + @@valid_responses = Set.new(['false', '']) + @@normal_responses = @@valid_responses.dup << 'true' STANDARD_HEADERS = { 'User-Agent' => 'Mephisto/' << Mephisto::Version::STRING, 'Content-Type' => 'application/x-www-form-urlencoded' @@ -60,7 +63,7 @@ class Akismet # Other server enviroment variables # In PHP there is an array of enviroment variables called $_SERVER which contains information about the web server itself as well as a key/value for every HTTP header sent with the request. This data is highly useful to Akismet as how the submited content interacts with the server can be very telling, so please include as much information as possible. def comment_check(options = {}) - call_akismet('comment-check', options) != "false" + !@@valid_responses.include?(call_akismet('comment-check', options)) end # This call is for submitting comments that weren't marked as spam but should have been. It takes identical arguments as comment check. lib/akismet.rb d4183f071e40ea47f4e0c7bf139374c196efa7ec technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/reddavis/mephisto/commit/9cb5c1e617e1b2f15161c88cf70d9574cf56f008 9cb5c1e617e1b2f15161c88cf70d9574cf56f008 2006-11-10T10:31:54-08:00 2006-11-10T10:31:54-08:00 add '' (empty string) as a possible valid response to Akismet#check_comment git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2461 567b1171-46fb-0310-a4c9-b4bef9110e78 84c199743ef2cd5634d616f84b5416bf10f2957c technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78