X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..2d22ab10f759828e27876f138b419ff4c0913b87:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 7ace4bca4..ac293a0bd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ class User < ActiveRecord::Base - require 'xml/libxml' + require "xml/libxml" has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) } @@ -7,13 +7,13 @@ class User < ActiveRecord::Base has_many :messages, -> { where(:to_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :foreign_key => :to_user_id has_many :new_messages, -> { where(:to_user_visible => true, :message_read => false).order(:sent_on => :desc) }, :class_name => "Message", :foreign_key => :to_user_id has_many :sent_messages, -> { where(:from_user_visible => true).order(:sent_on => :desc).preload(:sender, :recipient) }, :class_name => "Message", :foreign_key => :from_user_id - has_many :friends, -> { joins(:befriendee).where(:users => { :status => ["active", "confirmed"] }) } + has_many :friends, -> { joins(:befriendee).where(:users => { :status => %w(active confirmed) }) } has_many :friend_users, :through => :friends, :source => :befriendee has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" has_many :changesets, -> { order(:created_at => :desc) } has_many :changeset_comments, :foreign_key => :author_id - has_and_belongs_to_many :changeset_subscriptions, :class_name => 'Changeset', :join_table => 'changesets_subscribers', :foreign_key => 'subscriber_id' + has_and_belongs_to_many :changeset_subscriptions, :class_name => "Changeset", :join_table => "changesets_subscribers", :foreign_key => "subscriber_id" has_many :note_comments, :foreign_key => :author_id has_many :notes, :through => :note_comments @@ -26,27 +26,26 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" - scope :visible, -> { where(:status => ["pending", "active", "confirmed"]) } - scope :active, -> { where(:status => ["active", "confirmed"]) } + scope :visible, -> { where(:status => %w(pending active confirmed)) } + scope :active, -> { where(:status => %w(active confirmed)) } scope :identifiable, -> { where(:data_public => true) } 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>" } validates_presence_of :email, :display_name - validates_confirmation_of :email#, :message => ' addresses must match' - validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password' - validates_uniqueness_of :display_name, :allow_nil => true, :case_sensitive => false, :if => Proc.new { |u| u.display_name_changed? } - validates_uniqueness_of :email, :case_sensitive => false, :if => Proc.new { |u| u.email_changed? } - validates_uniqueness_of :openid_url, :allow_nil => true + validates_confirmation_of :email # , :message => ' addresses must match' + validates_confirmation_of :pass_crypt # , :message => ' must match the confirmation password' + validates_uniqueness_of :display_name, :allow_nil => true, :case_sensitive => false, :if => proc { |u| u.display_name_changed? } + validates_uniqueness_of :email, :case_sensitive => false, :if => proc { |u| u.email_changed? } validates_length_of :pass_crypt, :within => 8..255 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 => /\A[^\x00-\x1f\x7f\ufffe\uffff\/;.,?%#]*\z/, :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /\A\S/, :message => "has leading whitespace", :if => Proc.new { |u| u.display_name_changed? } - validates_format_of :display_name, :with => /\S\z/, :message => "has trailing whitespace", :if => Proc.new { |u| u.display_name_changed? } + validates_email_format_of :email, :if => proc { |u| u.email_changed? } + validates_email_format_of :new_email, :allow_blank => true, :if => proc { |u| u.new_email_changed? } + validates_format_of :display_name, :with => /\A[^\x00-\x1f\x7f\ufffe\uffff\/;.,?%#]*\z/, :if => proc { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\A\S/, :message => "has leading whitespace", :if => proc { |u| u.display_name_changed? } + validates_format_of :display_name, :with => /\S\z/, :message => "has trailing whitespace", :if => proc { |u| u.display_name_changed? } validates_exclusion_of :display_name, :in => %w(new terms save confirm confirm-email go_public reset-password forgot-password suspended) validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true @@ -59,18 +58,16 @@ class User < ActiveRecord::Base after_save :spam_check def self.authenticate(options) - if options[:username] and options[:password] + if options[:username] && options[:password] user = where("email = ? OR display_name = ?", options[:username], options[:username]).first if user.nil? users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username]) - if users.count == 1 - user = users.first - end + user = users.first if users.count == 1 end - if user and PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password]) + if user && PasswordHash.check(user.pass_crypt, user.pass_salt, options[:password]) if PasswordHash.upgrade?(user.pass_crypt, user.pass_salt) user.pass_crypt, user.pass_salt = PasswordHash.create(options[:password]) user.save @@ -83,36 +80,36 @@ class User < ActiveRecord::Base user = token.user if token end - if user and - ( user.status == "deleted" or - ( user.status == "pending" and not options[:pending] ) or - ( user.status == "suspended" and not options[:suspended] ) ) + if user && + (user.status == "deleted" || + (user.status == "pending" && !options[:pending]) || + (user.status == "suspended" && !options[:suspended])) user = nil end - token.update_column(:expiry, 1.week.from_now) if token and user + token.update_column(:expiry, 1.week.from_now) if token && user - return user + user end def to_xml doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node() - return doc + doc.root << to_xml_node + doc end def to_xml_node - el1 = XML::Node.new 'user' - el1['display_name'] = self.display_name.to_s - el1['account_created'] = self.creation_time.xmlschema - if self.home_lat and self.home_lon - home = XML::Node.new 'home' - home['lat'] = self.home_lat.to_s - home['lon'] = self.home_lon.to_s - home['zoom'] = self.home_zoom.to_s + el1 = XML::Node.new "user" + el1["display_name"] = display_name.to_s + el1["account_created"] = creation_time.xmlschema + if home_lat && home_lon + home = XML::Node.new "home" + home["lat"] = home_lat.to_s + home["lon"] = home_lon.to_s + home["zoom"] = home_zoom.to_s el1 << home end - return el1 + el1 end def description @@ -132,51 +129,50 @@ class User < ActiveRecord::Base end def preferred_language_from(array) - (languages & array.collect { |i| i.to_s }).first + (languages & array.collect(&:to_s)).first end def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) - if self.home_lon and self.home_lat - gc = OSM::GreatCircle.new(self.home_lat, self.home_lon) - bounds = gc.bounds(radius) + if home_lon && home_lat + gc = OSM::GreatCircle.new(home_lat, home_lon) sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") nearby = User.where("id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius).order(sql_for_distance).limit(num) else nearby = [] end - return nearby + nearby end def distance(nearby_user) - return OSM::GreatCircle.new(self.home_lat, self.home_lon).distance(nearby_user.home_lat, nearby_user.home_lon) + OSM::GreatCircle.new(home_lat, home_lon).distance(nearby_user.home_lat, nearby_user.home_lon) end def is_friends_with?(new_friend) - self.friends.where(:friend_user_id => new_friend.id).exists? + friends.where(:friend_user_id => new_friend.id).exists? end ## # returns true if a user is visible def visible? - ["pending","active","confirmed"].include? self.status + %w(pending active confirmed).include? status end ## # returns true if a user is active def active? - ["active","confirmed"].include? self.status + %w(active confirmed).include? status end ## # returns true if the user has the moderator role, false otherwise def moderator? - has_role? 'moderator' + has_role? "moderator" end ## # returns true if the user has the administrator role, false otherwise def administrator? - has_role? 'administrator' + has_role? "administrator" end ## @@ -189,46 +185,47 @@ class User < ActiveRecord::Base # 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? } + blocks.active.detect(&:needs_view?) end ## # delete a user - leave the account but purge most personal data def delete - self.display_name = "user_#{self.id}" + self.display_name = "user_#{id}" self.description = "" self.home_lat = nil self.home_lon = nil self.image = nil self.email_valid = false self.new_email = nil - self.openid_url = nil + self.auth_provider = nil + self.auth_uid = nil self.status = "deleted" - self.save + save end ## # return a spam score for a user def spam_score - 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 = self.description.spam_score / 4.0 - score += self.diary_entries.where("created_at > ?", 1.day.ago).count * 10 - 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 + changeset_score = changesets.size * 50 + trace_score = traces.size * 50 + diary_entry_score = diary_entries.inject(0) { |a, e| a + e.body.spam_score } + diary_comment_score = diary_comments.inject(0) { |a, e| a + e.body.spam_score } + + score = description.spam_score / 4.0 + score += diary_entries.where("created_at > ?", 1.day.ago).count * 10 + score += diary_entry_score / diary_entries.length if diary_entries.length > 0 + score += diary_comment_score / diary_comments.length if diary_comments.length > 0 score -= changeset_score score -= trace_score - return score.to_i + score.to_i end ## # perform a spam check on a user def spam_check - if status == "active" and spam_score > SPAM_THRESHOLD + if status == "active" && spam_score > SPAM_THRESHOLD update_column(:status, "suspended") end end @@ -236,10 +233,10 @@ class User < ActiveRecord::Base ## # return an oauth access token for a specified application def access_token(application_key) - return ClientApplication.find_by_key(application_key).access_token_for_user(self) + ClientApplication.find_by_key(application_key).access_token_for_user(self) end -private + private def set_defaults self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time)