X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7cf9bf0e553a141acab2afea53842f97eddd0a40..00c0a943eada2301726db0f2ef9974691dd84ad9:/app/models/note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index d37b863e5..0a1f4abd7 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -16,9 +16,10 @@
 #
 # Indexes
 #
-#  notes_created_at_idx   (created_at)
-#  notes_tile_status_idx  (tile,status)
-#  notes_updated_at_idx   (updated_at)
+#  index_notes_on_description  (to_tsvector('english'::regconfig, description)) USING gin
+#  notes_created_at_idx        (created_at)
+#  notes_tile_status_idx       (tile,status)
+#  notes_updated_at_idx        (updated_at)
 #
 # Foreign Keys
 #
@@ -94,7 +95,7 @@ class Note < ApplicationRecord
   # Return the note's description, derived from the first comment
   def description
     if user_ip.nil? && user_id.nil?
-      comments.first.body
+      all_comments.first.body if all_comments.first&.event == "opened"
     else
       RichText.new("text", super)
     end
@@ -103,7 +104,7 @@ class Note < ApplicationRecord
   # Return the note's author object, derived from the first comment
   def author
     if user_ip.nil? && user_id.nil?
-      comments.first.author
+      all_comments.first.author if all_comments.first&.event == "opened"
     else
       super
     end