2 files changed, 9 insertions, 1 deletions

@@ -14,6 +14,10 @@ class Admin::CommentsController < Admin::AdminController
     @comment.status = :published
     @comment.save!
 
+    if @comment.reply_to and @comment.reply_to.email != @comment.blog.user.email and @comment.reply_to.email != current_user.email
+      CommentMailer.with(comment: @comment).reply_comment_email.deliver_later
+    end
+
     flash.notice = "Comment successfully published."
     redirect_to pending_admin_comments_url
   end
@@ -46,6 +46,10 @@ class CommentsController < ApplicationController
 
         if @comment.status == :published
           CommentMailer.with(comment: @comment).new_comment_email.deliver_later
+
+          if @comment.reply_to and @comment.reply_to.email != @comment.blog.user.email
+            CommentMailer.with(comment: @comment).reply_comment_email.deliver_later
+          end
         else
           CommentMailer.with(comment: @comment).new_pending_comment_email.deliver_later
         end
@@ -60,6 +64,6 @@ class CommentsController < ApplicationController
   private
 
     def comment_params
-      params.require(:comment).permit(:username, :email, :website, :body)
+      params.require(:comment).permit(:username, :email, :website, :body, :reply_to_id)
     end
 end