Merge branch 'master' into routing

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

diff --git a/app/models/diary_comment.rb b/app/models/diary_comment.rb
index 0013606d06b55afa885306e38b7777f16518016b..5ace3d1580b4d2413613d79af3bcd993d0414573 100644 (file)
--- a/app/models/diary_comment.rb
+++ b/app/models/diary_comment.rb
@@ -5,6 +5,12 @@ class DiaryComment < ActiveRecord::Base
   validates_presence_of :body
   validates_associated :diary_entry
 
+  after_save :spam_check
+
+  def body
+    RichText.new(read_attribute(:body_format), read_attribute(:body))
+  end
+
   def digest
     md5 = Digest::MD5.new
     md5 << diary_entry_id.to_s
@@ -13,4 +19,10 @@ class DiaryComment < ActiveRecord::Base
     md5 << body
     md5.hexdigest
   end
+
+private
+
+  def spam_check
+    user.spam_check
+  end
 end