Merge branch 'pull/5338'

[rails.git] / app / controllers / api / notes_controller.rb

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index 3352c1f69b591c121fcf582d2ec01f6307185bac..7e2e7fb793babed86952313cc1d0703043d2f760 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -7,7 +7,6 @@ module Api
     authorize_resource
 
     before_action :set_locale
     authorize_resource
 
     before_action :set_locale

-    around_action :api_call_handle_error, :api_call_timeout

     before_action :set_request_formats, :except => [:feed]
 
     ##
     before_action :set_request_formats, :except => [:feed]
 
     ##


@@ -399,9 +398,13 @@ module Api
 
       comment = note.comments.create!(attributes)
 
 
       comment = note.comments.create!(attributes)
 

-      note.comments.map(&:author).uniq.each do |user|
-        UserMailer.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
+      if notify
+        note.subscribers.visible.each do |user|
+          UserMailer.note_comment_notification(comment, user).deliver_later if current_user != user
+        end

       end
       end

+
+      NoteSubscription.find_or_create_by(:note => note, :user => current_user) if current_user

     end
   end
 end
     end
   end
 end