X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/634565c5d399b71192484ac10fc2f8f1570e95f3..dc931c4ac47b340c9a2a8d855fa57a290e838260:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c6f4eaa12..58f8710f9 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,13 +1,11 @@
 class DiaryEntry < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :user, :counter_cache => true
   belongs_to :language, :foreign_key => 'language_code'
-  
-  has_many :diary_comments, :include => :user,
-                            :conditions => {
-                              :users => { :visible => true },
-                              :visible => true
-                            },
-                            :order => "diary_comments.id"
+
+  has_many :comments, -> { order(:id).preload(:user) }, :class_name => "DiaryComment"
+  has_many :visible_comments, -> { joins(:user).where(:visible => true, :users => { :status => ["active", "confirmed"] }).order(:id) }, :class_name => "DiaryComment"
+
+  scope :visible, -> { where(:visible => true) }
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
@@ -16,6 +14,22 @@ class DiaryEntry < ActiveRecord::Base
                             :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
   validates_numericality_of :longitude, :allow_nil => true,
                             :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
-  validates_associated :user
   validates_associated :language
+
+  after_initialize :set_defaults
+  after_save :spam_check
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
+private
+
+  def set_defaults
+    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  end
+
+  def spam_check
+    user.spam_check
+  end
 end