X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8140c993139247fb13e3827b30851d0b774c0f32..d377e8b4f23e6bad925eb2efa904baa7e1531fa6:/app/models/diary_entry.rb?ds=sidebyside

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 46d96fec7..368ee3aca 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,15 +1,31 @@
 class DiaryEntry < ActiveRecord::Base
-  belongs_to :user
-  has_many :diary_comments, :include => :user,
-                            :conditions => ["users.visible = ?", true],
-                            :order => "diary_comments.id"
-
-  validates_presence_of :title, :body
-  validates_length_of :title, :within => 1..255
-  validates_length_of :language, :within => 2..3, :allow_nil => true
-  validates_numericality_of :latitude, :allow_nil => true,
-                            :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
+  belongs_to :user, :counter_cache => true
+  belongs_to :language, :foreign_key => "language_code"
+
+  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 :title, :body, :presence => true
+  validates :title, :length => 1..255
+  validates :latitude, :allow_nil => true,
+                       :numericality => { :greater_than_or_equal_to => -90,
+                                          :less_than_or_equal_to => 90 }
+  validates :longitude, :allow_nil => true,
+                        :numericality => { :greater_than_or_equal_to => -180,
+                                           :less_than_or_equal_to => 180 }
+  validates :language, :user, :associated => true
+
+  after_save :spam_check
+
+  def body
+    RichText.new(self[:body_format], self[:body])
+  end
+
+  private
+
+  def spam_check
+    user.spam_check
+  end
 end