X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..e2839ae0988c8493e0f4f626695a0f4a7abd39d8:/app/models/note.rb diff --git a/app/models/note.rb b/app/models/note.rb index ec57b770b..6d8ca078f 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -22,6 +22,9 @@ class Note < ApplicationRecord include GeoRecord 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 } @@ -36,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? @@ -44,7 +49,7 @@ class Note < ApplicationRecord # Close a note def close self.status = "closed" - self.closed_at = Time.now.getutc + self.closed_at = Time.now.utc save end @@ -65,6 +70,18 @@ class Note < ApplicationRecord !closed_at.nil? end + def freshly_closed? + return false unless closed? + + Time.now.utc < freshly_closed_until + end + + def freshly_closed_until + return nil unless closed? + + closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT + end + # Return the author object, derived from the first comment def author comments.first.author