X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21bf5d79d680f7dc0447b1b5980ad5ce0a4b830c..b0a9b39c8d6c2ec32ed0748f8a7130b813fb123e:/app/models/user.rb?ds=inline diff --git a/app/models/user.rb b/app/models/user.rb index 2979b13d7..8b8f31676 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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,12 +25,10 @@ # 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 :bigint(8) # tou_agreed :datetime @@ -46,7 +43,8 @@ # users_home_idx (home_tile) # -class User < ActiveRecord::Base +class User < ApplicationRecord + require "digest" require "xml/libxml" has_many :traces, -> { where(:visible => true) } @@ -57,9 +55,9 @@ 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 :tokens, :class_name => "UserToken" + has_many :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) } + has_many :friends, :through => :friendships, :source => :befriendee + has_many :tokens, :class_name => "UserToken", :dependent => :destroy has_many :preferences, :class_name => "UserPreference" has_many :changesets, -> { order(:created_at => :desc) } has_many :changeset_comments, :foreign_key => :author_id @@ -70,6 +68,10 @@ class User < ActiveRecord::Base has_many :client_applications has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken" + has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner + has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id + has_many :access_tokens, :class_name => Doorkeeper.config.access_token_model.name, :foreign_key => :resource_owner_id + 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 @@ -85,9 +87,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] @@ -106,9 +106,10 @@ class User < ActiveRecord::Base 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 } + validates :avatar, :if => proc { |u| u.attachment_changes["avatar"] }, + :image => true 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? } @@ -117,7 +118,6 @@ class User < ActiveRecord::Base before_save :encrypt_password before_save :update_tile after_save :spam_check - after_save :reset_preferred_languages def to_param display_name @@ -158,26 +158,6 @@ class User < ActiveRecord::Base user end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node - 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 - el1 - end - def description RichText.new(self[:description_format], self[:description]) end @@ -198,17 +178,13 @@ class User < ActiveRecord::Base @preferred_languages ||= Locale.list(languages) end - def reset_preferred_languages - @preferred_languages = nil - end - 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_") sql_for_distance = gc.sql_for_distance("home_lat", "home_lon") nearby = User.active.identifiable - .where("id != ?", id) + .where.not(:id => id) .where(sql_for_area) .where("#{sql_for_distance} <= ?", radius) .order(Arel.sql(sql_for_distance)) @@ -224,7 +200,7 @@ class User < ActiveRecord::Base end def is_friends_with?(new_friend) - friends.where(:friend_user_id => new_friend.id).exists? + friendships.exists?(:befriendee => new_friend) end ## @@ -267,16 +243,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 @@ -305,11 +283,48 @@ class User < ActiveRecord::Base end ## - # return an oauth access token for a specified application + # return an oauth 1 access token for a specified application def access_token(application_key) ClientApplication.find_by(:key => application_key).access_token_for_user(self) end + ## + # return an oauth 2 access token for a specified application + def oauth_token(application_id) + application = Doorkeeper.config.application_model.find_by(:uid => application_id) + + Doorkeeper.config.access_token_model.find_or_create_for( + :application => application, + :resource_owner => self, + :scopes => application.scopes + ) + end + + def fingerprint + digest = Digest::SHA256.new + digest.update(email) + digest.update(pass_crypt) + digest.hexdigest + end + + def max_messages_per_hour + account_age_in_seconds = Time.now.utc - creation_time + account_age_in_hours = account_age_in_seconds / 3600 + recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count + active_reports = issues.with_status(:open).sum(:reports_count) + max_messages = account_age_in_hours.ceil + recent_messages - active_reports * 10 + max_messages.clamp(0, Settings.max_messages_per_hour) + end + + def max_friends_per_hour + account_age_in_seconds = Time.now.utc - creation_time + account_age_in_hours = account_age_in_seconds / 3600 + recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count + active_reports = issues.with_status(:open).sum(:reports_count) + max_friends = account_age_in_hours.ceil + recent_friends - active_reports * 10 + max_friends.clamp(0, Settings.max_friends_per_hour) + end + private def set_defaults