X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dbe165bbb3d6eda37d9579f1ac767599f9055607..dfe21fec82a03d5313d1c78c5f0e2390f0aef287:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index d8c5153b1..de5529e02 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,18 +1,67 @@ +# == Schema Information +# +# Table name: users +# +# email :string not null +# id :integer not null, primary key +# pass_crypt :string not null +# creation_time :datetime not null +# display_name :string default(""), not null +# data_public :boolean default(FALSE), not null +# description :text default(""), not null +# home_lat :float +# home_lon :float +# home_zoom :integer default(3) +# nearby :integer default(50) +# pass_salt :string +# image_file_name :text +# email_valid :boolean default(FALSE), not null +# new_email :string +# creation_ip :string +# languages :string +# status :enum default("pending"), not null +# terms_agreed :datetime +# consider_pd :boolean default(FALSE), not null +# auth_uid :string +# preferred_editor :string +# terms_seen :boolean default(FALSE), not null +# description_format :enum default("markdown"), not null +# image_fingerprint :string +# changesets_count :integer default(0), not null +# traces_count :integer default(0), not null +# diary_entries_count :integer default(0), not null +# image_use_gravatar :boolean default(FALSE), not null +# image_content_type :string +# auth_provider :string +# home_tile :integer +# +# Indexes +# +# users_auth_idx (auth_provider,auth_uid) UNIQUE +# users_display_name_idx (display_name) UNIQUE +# users_display_name_lower_idx (lower((display_name)::text)) +# users_email_idx (email) UNIQUE +# users_email_lower_idx (lower((email)::text)) +# users_home_idx (home_tile) +# + class User < ActiveRecord::Base require "xml/libxml" has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) } has_many :diary_comments, -> { order(:created_at => :desc) } + has_many :diary_entry_subscriptions, :class_name => "DiaryEntrySubscription" + has_many :diary_subscriptions, :through => :diary_entry_subscriptions, :source => :diary_entry 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 => %w(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_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_many :note_comments, :foreign_key => :author_id has_many :notes, :through => :note_comments @@ -26,8 +75,13 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" - scope :visible, -> { where(:status => %w(pending active confirmed)) } - scope :active, -> { where(:status => %w(active confirmed)) } + has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id + has_many :issue_comments + + has_many :reports + + 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, @@ -35,11 +89,11 @@ class User < ActiveRecord::Base :styles => { :large => "100x100>", :small => "50x50>" } validates :display_name, :presence => true, :allow_nil => true, :length => 3..255, - :exclusion => %w(new terms save confirm confirm-email go_public reset-password forgot-password suspended) + :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended] validates :display_name, :if => proc { |u| u.display_name_changed? }, :uniqueness => { :case_sensitive => false } validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => /\A[^\x00-\x1f\x7f\ufffe\uffff\/;.,?%#]*\z/ } + :format => { :with => %r{\A[^\x00-\x1f\x7f\ufffe\uffff/;.,?%#]*\z} } validates :display_name, :if => proc { |u| u.display_name_changed? }, :format => { :with => /\A\S/, :message => "has leading whitespace" } validates :display_name, :if => proc { |u| u.display_name_changed? }, @@ -48,21 +102,30 @@ class User < ActiveRecord::Base validates :email, :if => proc { |u| u.email_changed? }, :uniqueness => { :case_sensitive => false } validates :pass_crypt, :confirmation => true, :length => 8..255 - validates :home_lat, :home_lon, :allow_nil => true, :numericality => true + validates :home_lat, :allow_nil => true, :numericality => true, :inclusion => { :in => -90..90 } + validates :home_lon, :allow_nil => true, :numericality => true, :inclusion => { :in => -180..180 } validates :home_zoom, :allow_nil => true, :numericality => { :only_integer => true } validates :preferred_editor, :inclusion => Editors::ALL_EDITORS, :allow_nil => true - validates :image, :attachment_content_type => { :content_type => /\Aimage\/.*\Z/ } + validates :image, :attachment_content_type => { :content_type => %r{\Aimage/.*\Z} } + validates :auth_uid, :unless => proc { |u| u.auth_provider.nil? }, + :uniqueness => { :scope => :auth_provider } 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? } after_initialize :set_defaults before_save :encrypt_password + before_save :update_tile after_save :spam_check + after_save :reset_preferred_languages + + def to_param + display_name + end def self.authenticate(options) if options[:username] && options[:password] - user = where("email = ? OR display_name = ?", options[:username], options[:username]).first + user = find_by("email = ? OR display_name = ?", options[:username], options[:username]) if user.nil? users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username]) @@ -79,7 +142,7 @@ class User < ActiveRecord::Base user = nil end elsif options[:token] - token = UserToken.find_by_token(options[:token]) + token = UserToken.find_by(:token => options[:token]) user = token.user if token end @@ -90,7 +153,7 @@ class User < ActiveRecord::Base user = nil end - token.update_column(:expiry, 1.week.from_now) if token && user + token.update(:expiry => 1.week.from_now) if token && user user end @@ -120,7 +183,7 @@ class User < ActiveRecord::Base end def languages - attribute_present?(:languages) ? self[:languages].split(/ *, */) : [] + attribute_present?(:languages) ? self[:languages].split(/ *[, ] */) : [] end def languages=(languages) @@ -131,15 +194,25 @@ class User < ActiveRecord::Base languages.find { |l| Language.exists?(:code => l) } end - def preferred_language_from(array) - (languages & array.collect(&:to_s)).first + def preferred_languages + @preferred_languages ||= Locale.list(languages) + end + + def reset_preferred_languages + @preferred_languages = nil end def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) if home_lon && home_lat gc = OSM::GreatCircle.new(home_lat, home_lon) + sql_for_area = QuadTile.sql_for_area(gc.bounds(radius), "home_") 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) + nearby = User.active.identifiable + .where("id != ?", id) + .where(sql_for_area) + .where("#{sql_for_distance} <= ?", radius) + .order(Arel.sql(sql_for_distance)) + .limit(num) else nearby = [] end @@ -157,13 +230,13 @@ class User < ActiveRecord::Base ## # returns true if a user is visible def visible? - %w(pending active confirmed).include? status + %w[pending active confirmed].include? status end ## # returns true if a user is active def active? - %w(active confirmed).include? status + %w[active confirmed].include? status end ## @@ -212,13 +285,13 @@ class User < ActiveRecord::Base def spam_score 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 } + diary_entry_score = diary_entries.visible.inject(0) { |acc, elem| acc + elem.body.spam_score } + diary_comment_score = diary_comments.visible.inject(0) { |acc, elem| acc + elem.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 += diary_entry_score / diary_entries.length unless diary_entries.empty? + score += diary_comment_score / diary_comments.length unless diary_comments.empty? score -= changeset_score score -= trace_score @@ -228,21 +301,19 @@ class User < ActiveRecord::Base ## # perform a spam check on a user def spam_check - if status == "active" && spam_score > SPAM_THRESHOLD - update_column(:status, "suspended") - end + update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD end ## # return an oauth access token for a specified application def access_token(application_key) - ClientApplication.find_by_key(application_key).access_token_for_user(self) + ClientApplication.find_by(:key => application_key).access_token_for_user(self) end private def set_defaults - self.creation_time = Time.now.getutc unless self.attribute_present?(:creation_time) + self.creation_time = Time.now.getutc unless attribute_present?(:creation_time) end def encrypt_password @@ -251,4 +322,8 @@ class User < ActiveRecord::Base self.pass_crypt_confirmation = nil end end + + def update_tile + self.home_tile = QuadTile.tile_for_point(home_lat, home_lon) if home_lat && home_lon + end end