X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a39c645602f9d27b7927500c93890f4d7d79620e..44c6fdc27340ead5e88ca60558978babf4baf2d9:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 27ed7b648..609982389 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 # @@ -45,9 +43,11 @@ # users_home_idx (home_tile) # -class User < ActiveRecord::Base +class User < ApplicationRecord require "xml/libxml" + self.ignored_columns = ["nearby"] + has_many :traces, -> { where(:visible => true) } has_many :diary_entries, -> { order(:created_at => :desc) } has_many :diary_comments, -> { order(:created_at => :desc) } @@ -56,8 +56,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,9 +84,7 @@ 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 validates :display_name, :presence => true, :length => 3..255, :exclusion => %w[new terms save confirm confirm-email go_public reset-password forgot-password suspended] @@ -98,12 +96,13 @@ class User < ActiveRecord::Base 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 } @@ -122,10 +121,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 @@ -199,7 +198,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_") @@ -221,7 +220,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 ## @@ -264,16 +263,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 @@ -298,7 +299,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 ##