Make spam scoring work with new rich text system

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 9a230898a87779160d1038cac73b1e0ef498b2a3..cebea94685711f8b972db57191444498a6a60717 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -41,7 +41,10 @@ class User < ActiveRecord::Base
   validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
   validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
-  after_initialize :set_creation_time
+  attr_accessible :display_name, :email, :email_confirmation, :openid_url,
+                  :pass_crypt, :pass_crypt_confirmation, :consider_pd
+
+  after_initialize :set_defaults
   before_save :encrypt_password
 
   has_attached_file :image, 
@@ -98,6 +101,10 @@ class User < ActiveRecord::Base
     return el1
   end
 
+  def description
+    RichText.new(read_attribute(:description_format), read_attribute(:description))
+  end
+
   def languages
     attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
   end
@@ -197,10 +204,10 @@ class User < ActiveRecord::Base
   def spam_score
     changeset_score = self.changesets.limit(10).length * 50
     trace_score = self.traces.limit(10).length * 50
-    diary_entry_score = self.diary_entries.inject(0) { |s,e| s += OSM.spam_score(e.body) }
-    diary_comment_score = self.diary_comments.inject(0) { |s,e| s += OSM.spam_score(e.body) }
+    diary_entry_score = self.diary_entries.inject(0) { |s,e| s += e.body.spam_score }
+    diary_comment_score = self.diary_comments.inject(0) { |s,c| s += c.body.spam_score }
 
-    score = OSM.spam_score(self.description)
+    score = self.description.spam_score
     score += diary_entry_score / self.diary_entries.length if self.diary_entries.length > 0
     score += diary_comment_score / self.diary_comments.length if self.diary_comments.length > 0
     score -= changeset_score
@@ -217,8 +224,9 @@ class User < ActiveRecord::Base
 
 private
 
-  def set_creation_time
+  def set_defaults
     self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
+    self.description_format = "markdown" unless self.attribute_present?(:description_format)
   end
 
   def encrypt_password