Police the MAX_NOTE_REQUEST_AREA limit on the client

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

diff --git a/app/models/user.rb b/app/models/user.rb
index 9a230898a87779160d1038cac73b1e0ef498b2a3..33f01c06bd972bbcee063c05ff5886ecc31e5afc 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,11 +12,16 @@ class User < ActiveRecord::Base
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, :order => 'created_at DESC'
   has_many :tokens, :class_name => "UserToken"
   has_many :preferences, :class_name => "UserPreference"
   has_many :changesets, :order => 'created_at DESC'

+  has_many :note_comments, :foreign_key => :author_id
+  has_many :notes, :through => :note_comments

 
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 
 
   has_many :client_applications
   has_many :oauth_tokens, :class_name => "OauthToken", :order => "authorized_at desc", :include => [:client_application]
 

-  has_many :active_blocks, :class_name => "UserBlock", :conditions => proc { [ "user_blocks.ends_at > :ends_at or user_blocks.needs_view", { :ends_at => Time.now.getutc } ] }
+  has_many :blocks, :class_name => "UserBlock"
+  has_many :blocks_created, :class_name => "UserBlock", :foreign_key => :creator_id
+  has_many :blocks_revoked, :class_name => "UserBlock", :foreign_key => :revoker_id
+

   has_many :roles, :class_name => "UserRole"
 
   scope :visible, where(:status => ["pending", "active", "confirmed"])
   has_many :roles, :class_name => "UserRole"
 
   scope :visible, where(:status => ["pending", "active", "confirmed"])


@@ -33,7 +38,7 @@ class User < ActiveRecord::Base
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
   validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? }
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
   validates_email_format_of :email, :if => Proc.new { |u| u.email_changed? }
   validates_email_format_of :new_email, :allow_blank => true, :if => Proc.new { |u| u.new_email_changed? }

-  validates_format_of :display_name, :with => /^[^\/;.,?]*$/, :if => Proc.new { |u| u.display_name_changed? }
+  validates_format_of :display_name, :with => /^[^\/;.,?%#]*$/, :if => Proc.new { |u| u.display_name_changed? }

   validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? }
   validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? }
   validates_numericality_of :home_lat, :allow_nil => true
   validates_format_of :display_name, :with => /^\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? }
   validates_format_of :display_name, :with => /\S$/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? }
   validates_numericality_of :home_lat, :allow_nil => true


@@ -41,10 +46,14 @@ 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
 
   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,
+                  :image_use_gravatar
+
+  after_initialize :set_defaults

   before_save :encrypt_password
 
   before_save :encrypt_password
 

-  has_attached_file :image, 
+  has_attached_file :image,

     :default_url => "/assets/:class/:attachment/:style.png",
     :styles => { :large => "100x100>", :small => "50x50>" }
 
     :default_url => "/assets/:class/:attachment/:style.png",
     :styles => { :large => "100x100>", :small => "50x50>" }
 


@@ -73,10 +82,10 @@ class User < ActiveRecord::Base
       user = nil
     end
 
       user = nil
     end
 

-    token.update_attribute(:expiry, 1.week.from_now) if token and user
+    token.update_column(:expiry, 1.week.from_now) if token and user

 
     return user
 
     return user

-  end 
+  end

 
   def to_xml
     doc = OSM::API.new.get_xml_doc
 
   def to_xml
     doc = OSM::API.new.get_xml_doc


@@ -98,6 +107,10 @@ class User < ActiveRecord::Base
     return el1
   end
 
     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
   def languages
     attribute_present?(:languages) ? read_attribute(:languages).split(/ *, */) : []
   end


@@ -115,7 +128,7 @@ class User < ActiveRecord::Base
   end
 
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
   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")
       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")


@@ -172,10 +185,10 @@ class User < ActiveRecord::Base
   end
 
   ##
   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
   # a message, or nil if there are none.
   def blocked_on_view

-    active_blocks.detect { |b| b.needs_view? }
+    blocks.active.detect { |b| b.needs_view? }

   end
 
   ##
   end
 
   ##


@@ -188,6 +201,7 @@ class User < ActiveRecord::Base
     self.image = nil
     self.email_valid = false
     self.new_email = nil
     self.image = nil
     self.email_valid = false
     self.new_email = nil

+    self.openid_url = nil

     self.status = "deleted"
     self.save
   end
     self.status = "deleted"
     self.save
   end


@@ -195,12 +209,12 @@ class User < ActiveRecord::Base
   ##
   # return a spam score for a user
   def spam_score
   ##
   # 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
-    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) }
+    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 }

 
 

-    score = OSM.spam_score(self.description)
+    score = self.description.spam_score / 4.0

     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
     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,14 +231,16 @@ class User < ActiveRecord::Base
 
 private
 
 
 private
 

-  def set_creation_time
+  def set_defaults

     self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)
     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
     if pass_crypt_confirmation
       self.pass_salt = OSM::make_token(8)
       self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt)
   end
 
   def encrypt_password
     if pass_crypt_confirmation
       self.pass_salt = OSM::make_token(8)
       self.pass_crypt = OSM::encrypt_password(pass_crypt, pass_salt)

+      self.pass_crypt_confirmation = nil

     end
   end
 end
     end
   end
 end