X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b439bac920f2d8506db9ad575a69312cd56bbf65..0baa293699cf6efaea979b342ec877af522213ca:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 795ddc132..1095dc6ea 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,7 +3,7 @@ # Table name: users # # email :string not null -# id :integer not null, primary key +# id :bigint(8) not null, primary key # pass_crypt :string not null # creation_time :datetime not null # display_name :string default(""), not null @@ -14,7 +14,6 @@ # 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 @@ -26,14 +25,13 @@ # 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 +# home_tile :bigint(8) +# tou_agreed :datetime # # Indexes # @@ -56,8 +54,8 @@ 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 => %w[active confirmed] }) } - has_many :friend_users, :through => :friends, :source => :befriendee + has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) } + has_many :friends, :through => :friendships, :source => :befriendee has_many :tokens, :class_name => "UserToken" has_many :preferences, :class_name => "UserPreference" has_many :changesets, -> { order(:created_at => :desc) } @@ -84,35 +82,25 @@ class User < ActiveRecord::Base 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>" } + has_one_attached :avatar - INVALID_ASCII_CHARS = "/;.,?%#" - INVALID_NON_ASCII_CHARS = "\x00-\x1f\x7f\ufffe\uffff" - - validates :display_name, :presence => true, :allow_nil => true, :length => 3..255, + validates :display_name, :presence => true, :length => 3..255, :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 => %r{\A[^#{INVALID_NON_ASCII_CHARS}]*\z} } - validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => %r{\A[^#{INVALID_ASCII_CHARS}]*\z}, - :message => I18n.t("users.account.invalid chars", invalid_chars: INVALID_ASCII_CHARS) } - validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => /\A\S/, :message => I18n.t("users.account.leading whitespace") } - validates :display_name, :if => proc { |u| u.display_name_changed? }, - :format => { :with => /\S\z/, :message => I18n.t("users.account.trailing whitespace") } - validates :email, :presence => true, :confirmation => true + :characters => { :url_safe => true }, + :whitespace => { :leading => false, :trailing => false } + validates :email, :presence => true, :confirmation => true, :characters => true validates :email, :if => proc { |u| u.email_changed? }, :uniqueness => { :case_sensitive => false } + validates :email, :if => proc { |u| u.email_changed? }, + :whitespace => { :leading => false, :trailing => false } validates :pass_crypt, :confirmation => true, :length => 8..255 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 => %r{\Aimage/.*\Z} } validates :auth_uid, :unless => proc { |u| u.auth_provider.nil? }, :uniqueness => { :scope => :auth_provider } @@ -131,10 +119,10 @@ class User < ActiveRecord::Base def self.authenticate(options) if options[:username] && options[:password] - user = find_by("email = ? OR display_name = ?", options[:username], options[:username]) + user = find_by("email = ? OR display_name = ?", options[:username].strip, options[:username]) if user.nil? - users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username], options[:username]) + users = where("LOWER(email) = LOWER(?) OR LOWER(display_name) = LOWER(?)", options[:username].strip, options[:username]) user = users.first if users.count == 1 end @@ -208,7 +196,7 @@ class User < ActiveRecord::Base @preferred_languages = nil end - def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS) + def nearby(radius = Settings.nearby_radius, num = Settings.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_") @@ -230,7 +218,7 @@ class User < ActiveRecord::Base end def is_friends_with?(new_friend) - friends.where(:friend_user_id => new_friend.id).exists? + friendships.where(:befriendee => new_friend).exists? end ## @@ -273,16 +261,18 @@ class User < ActiveRecord::Base ## # delete a user - leave the account but purge most personal data def delete + avatar.purge_later + 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.auth_provider = nil self.auth_uid = nil self.status = "deleted" + save end @@ -307,7 +297,7 @@ class User < ActiveRecord::Base ## # perform a spam check on a user def spam_check - update(:status => "suspended") if status == "active" && spam_score > SPAM_THRESHOLD + update(:status => "suspended") if status == "active" && spam_score > Settings.spam_threshold end ##