Merge remote-tracking branch 'openstreetmap/pull/1082'

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index aaf48be4fdcc8c9f200b41efceabfc74e8058f09..2796eb612ac8eea869270fc7cee2f72bb73b6da8 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -2,6 +2,27 @@ class DiaryComment < ActiveRecord::Base
   belongs_to :user
   belongs_to :diary_entry
 
-  validates_presence_of :body
-  validates_associated :diary_entry
+  validates :body, :presence => true
+  validates :diary_entry, :user, :associated => true
+
+  after_save :spam_check
+
+  def body
+    RichText.new(self[:body_format], self[:body])
+  end
+
+  def digest
+    md5 = Digest::MD5.new
+    md5 << diary_entry_id.to_s
+    md5 << user_id.to_s
+    md5 << created_at.xmlschema
+    md5 << body
+    md5.hexdigest
+  end
+
+  private
+
+  def spam_check
+    user.spam_check
+  end
 end