3 files changed, 29 insertions, 2 deletions

@@ -31,6 +31,29 @@ class Admin::CommentsController < Admin::AdminController
     redirect_to pending_admin_comments_url
   end
 
+  def mark_spam
+    @comment = Comment.find(params[:id])
+
+    akismet_params = {
+      type: "comment",
+      text: @comment.body,
+      created_at: @comment.created_at,
+      author: @comment.username,
+      author_email: @comment.email,
+      author_url: @comment.website,
+      post_url: url_for(@comment.blog),
+      post_modified_at: @comment.blog.updated_at,
+      referrer: @comment.referrer
+    }
+
+    Akismet.spam @comment.request_ip, @comment.user_agent, akismet_params
+
+    @comment.destroy!
+
+    flash.notice = "Comment successfully marked as spam."
+    redirect_back pending_admin_comments_url
+  end
+
   def destroy
     if Comment.destroy(params[:id])
       flash.notice = "Comment successfully deleted."
@@ -6,6 +6,9 @@ class CommentsController < ApplicationController
     raise ActiveRecord::RecordNotFound unless @blog.published
 
     @comment = @blog.comments.new(comment_params)
+    @comment.request_ip = request.ip
+    @comment.user_agent = request.user_agent
+    @comment.referrer = request.referrer
 
     unless @comment.valid?
       flash.alert = "Error posting comment."
@@ -23,11 +26,11 @@ class CommentsController < ApplicationController
       author_url: @comment.website,
       post_url: url_for(@comment.blog),
       post_modified_at: @comment.blog.updated_at,
-      referrer: request.referrer,
+      referrer: @comment.referrer,
       env: request.env.slice(*akismet_vars)
     }
 
-    is_spam, is_blatant = Akismet.check(request.ip, request.user_agent, akismet_params)
+    is_spam, is_blatant = Akismet.check(@comment.ip, @comment.user_agent, akismet_params)
 
     if is_blatant
       # I am lying.
@@ -22,4 +22,5 @@
         %ul.admin-actions
           %li= link_to "Accept", accept_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to accept this comment?" }
           %li= link_to "Reject", reject_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to reject this comment?" }
+          %li= link_to "Mark Spam", mark_spam_admin_comment_url(comment), method: :post, data: { confirm: "Are you sure you want to mark this comment as spam?" }
 = will_paginate @comments