Merge remote-tracking branch 'upstream/pull/5401'

[rails.git] / app / models / note.rb

diff --git a/app/models/note.rb b/app/models/note.rb
index c3e0d776c61416fb32ed29d0af81c05279cff1e6..6d8ca078fa42e1d12e1652e3795a1e32caf02c26 100644 (file)
--- 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 :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 }
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
                  :numericality => { :on => :update, :only_integer => true }


@@ -37,6 +39,8 @@ class Note < ApplicationRecord
 
   after_initialize :set_defaults
 
 
   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?
   # 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?
 
   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
   end
 
   # Return the author object, derived from the first comment