X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8e51614cb04da1f61ec403af49d249209c1f7f9..377391e8bb4294a539d5363a20af51243877243c:/app/models/note.rb?ds=sidebyside diff --git a/app/models/note.rb b/app/models/note.rb index c3e0d776c..6d8ca078f 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -23,6 +23,8 @@ class Note < ApplicationRecord has_many :comments, -> { left_joins(:author).where(:visible => true, :users => { :status => [nil, "active", "confirmed"] }).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id has_many :all_comments, -> { left_joins(:author).order(:created_at) }, :class_name => "NoteComment", :foreign_key => :note_id, :inverse_of => :note + has_many :subscriptions, :class_name => "NoteSubscription" + has_many :subscribers, :through => :subscriptions, :source => :user validates :id, :uniqueness => true, :presence => { :on => :update }, :numericality => { :on => :update, :only_integer => true } @@ -37,6 +39,8 @@ class Note < ApplicationRecord after_initialize :set_defaults + DEFAULT_FRESHLY_CLOSED_LIMIT = 7.days + # Sanity check the latitude and longitude and add an error if it's broken def validate_position errors.add(:base, "Note is not in the world") unless in_world? @@ -75,7 +79,7 @@ class Note < ApplicationRecord def freshly_closed_until return nil unless closed? - closed_at + 7.days + closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT end # Return the author object, derived from the first comment