Merge branch 'master' into notes

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 889c40451e45707b2babfadc7c04f8ad1638eb4d..33f01c06bd972bbcee063c05ff5886ecc31e5afc 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -47,12 +47,13 @@ class User < ActiveRecord::Base
   validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
 
   attr_accessible :display_name, :email, :email_confirmation, :openid_url,
-                  :pass_crypt, :pass_crypt_confirmation, :consider_pd
+                  :pass_crypt, :pass_crypt_confirmation, :consider_pd,
+                  :image_use_gravatar
 
   after_initialize :set_defaults
   before_save :encrypt_password
 
-  has_attached_file :image, 
+  has_attached_file :image,
     :default_url => "/assets/:class/:attachment/:style.png",
     :styles => { :large => "100x100>", :small => "50x50>" }
 
@@ -84,7 +85,7 @@ class User < ActiveRecord::Base
     token.update_column(:expiry, 1.week.from_now) if token and user
 
     return user
-  end 
+  end
 
   def to_xml
     doc = OSM::API.new.get_xml_doc
@@ -127,7 +128,7 @@ class User < ActiveRecord::Base
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
-    if self.home_lon and self.home_lat 
+    if self.home_lon and self.home_lat
       gc = OSM::GreatCircle.new(self.home_lat, self.home_lon)
       bounds = gc.bounds(radius)
       sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
@@ -184,7 +185,7 @@ class User < ActiveRecord::Base
   end
 
   ##
-  # returns the first active block which would require users to view 
+  # returns the first active block which would require users to view
   # a message, or nil if there are none.
   def blocked_on_view
     blocks.active.detect { |b| b.needs_view? }
@@ -208,8 +209,8 @@ class User < ActiveRecord::Base
   ##
   # return a spam score for a user
   def spam_score
-    changeset_score = self.changesets.limit(10).length * 50
-    trace_score = self.traces.limit(10).length * 50
+    changeset_score = self.changesets.size * 50
+    trace_score = self.traces.size * 50
     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 }