X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38b464a2387d8b4303f3f6749d3aa61856023dd4..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/app/models/user.rb?ds=inline diff --git a/app/models/user.rb b/app/models/user.rb index 36ae0b55c..8b8f31676 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -43,11 +43,10 @@ # users_home_idx (home_tile) # -class User < ActiveRecord::Base +class User < ApplicationRecord + require "digest" 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) } @@ -58,7 +57,7 @@ class User < ActiveRecord::Base 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 :friendships, -> { joins(:befriendee).where(:users => { :status => %w[active confirmed] }) } has_many :friends, :through => :friendships, :source => :befriendee - has_many :tokens, :class_name => "UserToken" + 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 @@ -69,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 @@ -105,6 +108,8 @@ class User < ActiveRecord::Base validates :preferred_editor, :inclusion => Editors::ALL_EDITORS, :allow_nil => true 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? } @@ -113,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 @@ -154,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 @@ -194,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)) @@ -220,7 +200,7 @@ class User < ActiveRecord::Base end def is_friends_with?(new_friend) - friendships.where(:befriendee => new_friend).exists? + friendships.exists?(:befriendee => new_friend) end ## @@ -303,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