13 files changed, 92 insertions, 1 deletions

@@ -17,3 +17,4 @@
 //= require jquery-ui
 //= require js-routes
 //= require_tree ./admin
+//= require_tree ./main
@@ -0,0 +1,14 @@
+comments_ready = ->
+  $(".comment-reply-to").click ->
+    $("#comment_reply_to_id").val($(this).data("commentId"))
+    $("#comment-reply-msg .comment-reply-author").text($(this).data("commentAuthor"))
+    $("#comment-reply-msg").show()
+    return false
+
+  $(".comment-reply-cancel").click ->
+    $("#comment_reply_to_id").val("")
+    $("#comment-reply-msg").hide()
+    return false
+
+$(document).ready(comments_ready)
+$(document).on('turbolinks:load', comments_ready)
@@ -251,9 +251,29 @@
     float: right;
     margin-top: 1em;
   }
+
+  .comment-reply-to {
+    float: right;
+    margin-right: 0.5em;
+
+    img {
+      display: block;
+    }
+  }
 }
 
 #comment-form {
+  #comment-reply-msg {
+    display: none;
+    margin-top: 1em;
+    margin-bottom: 0;
+    margin-left: 0;
+
+    .comment-reply-author {
+      font-weight: bold;
+    }
+  }
+
   fieldset {
     border: 0;
 
@@ -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
@@ -8,4 +8,9 @@ class CommentMailer < ApplicationMailer
     @comment = params[:comment]
     mail(to: @comment.blog.user.email, subject: "[Four Island] Pending comment on #{@comment.blog.title}")
   end
+
+  def reply_comment_email
+    @comment = params[:comment]
+    mail(to: @comment.reply_to.email, subject: "[Four Island] Reply to your comment on #{@comment.blog.title}")
+  end
 end
@@ -3,6 +3,9 @@ class Comment < ApplicationRecord
 
   belongs_to :blog
 
+  has_many :replies, class_name: "Comment", foreign_key: "reply_to_id"
+  belongs_to :reply_to, class_name: "Comment", optional: true
+
   validates :body, presence: true
   validates :username, presence: true
   validates :email, presence: true, format: URI::MailTo::EMAIL_REGEXP
@@ -0,0 +1,14 @@
+%p
+  A reply has been posted to your comment on
+  = succeed "." do
+    = link_to @comment.blog.title, @comment.blog
+  The original comment:
+%blockquote= @comment.reply_to.body
+%p
+  = @comment.username
+  left the following response:
+%blockquote= @comment.body
+%p
+  Posted:
+  = @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+%p= link_to "See the comment on the web", blog_url(@comment.blog, anchor: "comment-#{@comment.id}")
@@ -0,0 +1,19 @@
+A reply has been posted to your comment on <%= @comment.blog.title %>. The original comment:
+
+---
+
+<%= @comment.reply_to.body %>
+
+---
+
+<%= @comment.username %> posted the following response:
+
+---
+
+<%= @comment.body %>
+
+---
+
+Posted: <%= @comment.published_at.strftime("%B #{@comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P") %>
+
+See the comment on the web: <%= blog_url(@comment.blog, anchor: "comment-#{@comment.id}") %>
@@ -11,3 +11,4 @@
         = link_to comment.username, comment.website
     on
     = comment.published_at.strftime("%B #{comment.published_at.day.ordinalize}, %Y at %-I:%M:%S%P")
+    = link_to (image_tag "comment_add.png"), "#", class: "comment-reply-to", title: "Reply to comment", data: { comment_id: comment.id, comment_author: comment.username }
@@ -1,6 +1,12 @@
 = form_for @comment || blog.comments.new, html: { id: "comment-form" } do |f|
+  = f.hidden_field :reply_to_id
   %fieldset#comment-body-field
     %blockquote.bubble.rounded.bottom
+      #comment-reply-msg
+        = link_to (image_tag "cross"), "#", class: "comment-reply-cancel"
+        Replying to comment by
+        = succeed ":" do
+          %span.comment-reply-author
       = f.label :body
       = f.text_area :body
     %cite.bubble Feel free to post a comment! You may use Markdown.