db/migrate/005_add_mollomid_column.rb @@ -1,5 +1,5 @@ class Admin::CommentsController < ApplicationController - + def index conditions = case params[:status] when "approved" @@ -15,13 +15,13 @@ class Admin::CommentsController < ApplicationController else @page.comments.paginate(:page => params[:page], :conditions => conditions) end - + respond_to do |format| format.html format.csv { render :text => @comments.to_csv } end end - + def destroy @comment = Comment.find(params[:id]) @comment.destroy @@ -29,11 +29,11 @@ class Admin::CommentsController < ApplicationController ResponseCache.instance.expire_response(@comment.page.url) redirect_to :back end - + def edit @comment = Comment.find(params[:id]) end - + def update @comment = Comment.find(params[:id]) begin @@ -48,7 +48,7 @@ class Admin::CommentsController < ApplicationController flash[:notice] = "There was an error saving the comment" end end - + def enable @page = Page.find(params[:page_id]) @page.enable_comments = 1 @@ -56,28 +56,36 @@ class Admin::CommentsController < ApplicationController flash[:notice] = "Comments has been enabled for #{@page.title}" redirect_to page_index_path end - + def approve @comment = Comment.find(params[:id]) - @comment.approve! + begin + @comment.approve! + rescue Comment::AntispamWarning => e + antispamnotice = "The antispam engine gave a warning: #{e}<br />" + end ResponseCache.instance.expire_response(@comment.page.url) - flash[:notice] = "Comment was successfully approved on page #{@comment.page.title}" + flash[:notice] = "Comment was successfully approved on page #{@comment.page.title}" + (antispamnotice ? " (#{antispamnotice})" : "") redirect_to :back end - + def unapprove @comment = Comment.find(params[:id]) - @comment.unapprove! + begin + @comment.unapprove! + rescue Comment::AntispamWarning => e + antispamnotice = "The antispam engine gave a warning: #{e}" + end ResponseCache.instance.expire_response(@comment.page.url) - flash[:notice] = "Comment was successfully unapproved on page #{@comment.page.title}" + flash[:notice] = "Comment was successfully unapproved on page #{@comment.page.title}" + (antispamnotice ? " (#{antispamnotice})" : "" ) redirect_to :back end - - + + protected - - def announce_comment_removed - flash[:notice] = "The comment was successfully removed from the site." - end - + + def announce_comment_removed + flash[:notice] = "The comment was successfully removed from the site." + end + end \ No newline at end of file app/controllers/admin/comments_controller.rb @@ -28,6 +28,7 @@ class Comment < ActiveRecord::Base f.write mollom.server_list.to_yaml end end + rescue Mollom::Error end def mollom @@ -63,10 +64,14 @@ class Comment < ActiveRecord::Base :author_url => self.author_url, # author url :post_body => self.content # comment text ) + ham = reponse.ham? + self.update_attibute(:mollom_id, response.session_id) response.ham? else false end + rescue Mollom::Error + return false end def unapproved? @@ -83,6 +88,20 @@ class Comment < ActiveRecord::Base def unapprove! self.update_attribute(:approved_at, nil) + # if we have to unapprove, and use mollom, it means + # the initial check was false. Submit this to mollom as Spam. + # Ideally, we'd need a different feedback for + # - spam + # - profanity + # - unwanted + # - low-quality + begin + if mollom.key_ok? and !self.mollom_id.empty? + mollom.send_feedback :session_id => self.mollom_id, :feedback => 'spam' + end + rescue Mollom::Error => e + raise Comment::AntispamWarning.new(e.to_s) + end end private @@ -116,4 +135,6 @@ class Comment < ActiveRecord::Base simple_format(h(content)) end end + + class AntispamWarning < StandardError; end end app/models/comment.rb 9ff7044e5fac5bad6262d98d31add1ab88ac3a85 franklouwers frank@openminds.be http://github.com/franklouwers/radiant-comments/commit/e3af43df9a895dfdce419f46efd8ee11baa74757 e3af43df9a895dfdce419f46efd8ee11baa74757 2008-10-03T08:02:06-07:00 2008-10-03T08:02:06-07:00 Comment feedback to mollom: report spam 1e7a93f9b53b33d59b801e732bca68780314f7d7 franklouwers frank@openminds.be