X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a128b4f585cb2f75ad1057d0b7c5af6713ed4186..f771938538f88bf1313b911c8a9c39e4e2e4c84f:/app/controllers/diary_comments_controller.rb

diff --git a/app/controllers/diary_comments_controller.rb b/app/controllers/diary_comments_controller.rb
index 8abf2071b..a9a7a2641 100644
--- a/app/controllers/diary_comments_controller.rb
+++ b/app/controllers/diary_comments_controller.rb
@@ -11,7 +11,7 @@ class DiaryCommentsController < ApplicationController
   authorize_resource
 
   before_action :lookup_user, :only => :index
-  before_action :check_database_writable, :only => [:hide, :unhide]
+  before_action :check_database_writable, :only => [:create, :hide, :unhide]
 
   allow_thirdparty_images :only => :index
 
@@ -26,6 +26,29 @@ class DiaryCommentsController < ApplicationController
     @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
   end
 
+  def create
+    @entry = DiaryEntry.find(params[:id])
+    @comments = @entry.visible_comments
+    @diary_comment = @entry.comments.build(comment_params)
+    @diary_comment.user = current_user
+    if @diary_comment.save
+
+      # Notify current subscribers of the new comment
+      @entry.subscribers.visible.each do |user|
+        UserMailer.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
+      end
+
+      # Add the commenter to the subscribers if necessary
+      @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
+
+      redirect_to diary_entry_path(@entry.user, @entry)
+    else
+      render :action => "new"
+    end
+  rescue ActiveRecord::RecordNotFound
+    render "diary_entries/no_such_entry", :status => :not_found
+  end
+
   def hide
     comment = DiaryComment.find(params[:comment])
     comment.update(:visible => false)
@@ -37,4 +60,12 @@ class DiaryCommentsController < ApplicationController
     comment.update(:visible => true)
     redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
   end
+
+  private
+
+  ##
+  # return permitted diary comment parameters
+  def comment_params
+    params.require(:diary_comment).permit(:body)
+  end
 end