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

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c6f4eaa12..a66eb599d 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,21 +1,30 @@
 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 => %w(active confirmed) }).order(:id) }, :class_name => "DiaryComment"
+
+  scope :visible, -> { where(:visible => true) }
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
-  #validates_length_of :language, :within => 2..5, :allow_nil => false
+  # validates_length_of :language, :within => 2..5, :allow_nil => false
   validates_numericality_of :latitude, :allow_nil => true,
-                            :greater_than_or_equal_to => -90, :less_than_or_equal_to => 90
+                                       :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
+                                        :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
+
+  after_save :spam_check
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
+  private
+
+  def spam_check
+    user.spam_check
+  end
 end