X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/00375024263970a43ea7d39e3c65dfd0f32e8869..dc2a2c8ebd1a11e4a64555fda22c6859a51defff:/app/models/diary_entry.rb

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index 99a56b2ce..fa3c4c848 100644
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -1,40 +1,30 @@
 class DiaryEntry < ActiveRecord::Base
   belongs_to :user, :counter_cache => true
-  belongs_to :language, :foreign_key => 'language_code'
+  belongs_to :language, :foreign_key => "language_code"
 
-  has_many :comments, :class_name => "DiaryComment",
-                      :include => :user,
-                      :order => "diary_comments.id"
-  has_many :visible_comments, :class_name => "DiaryComment",
-                              :include => :user,
-                              :conditions => {
-                                :users => { :status => ["active", "confirmed" ] },
-                                :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)
+  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
+                                        :greater_than_or_equal_to => -180, :less_than_or_equal_to => 180
   validates_associated :language
 
-  attr_accessible :title, :body, :language_code, :latitude, :longitude
-
-  after_initialize :set_defaults
+  after_save :spam_check
 
   def body
     RichText.new(read_attribute(:body_format), read_attribute(:body))
   end
 
-private
+  private
 
-  def set_defaults
-    self.body_format = "markdown" unless self.attribute_present?(:body_format)
+  def spam_check
+    user.spam_check
   end
 end