Merge remote-tracking branch 'upstream/pull/5353'

[rails.git] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index 4241a9e5687b0e4d71876794dd3fd41e6aacb2f1..917faca2184f38f79999d7ea5e31f5768727d0d7 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -15,7 +15,6 @@
 #  pass_salt            :string
 #  email_valid          :boolean          default(FALSE), not null
 #  new_email            :string
 #  pass_salt            :string
 #  email_valid          :boolean          default(FALSE), not null
 #  new_email            :string

-#  creation_ip          :string

 #  languages            :string
 #  status               :enum             default("pending"), not null
 #  terms_agreed         :datetime
 #  languages            :string
 #  status               :enum             default("pending"), not null
 #  terms_agreed         :datetime


@@ -33,9 +32,11 @@
 #  tou_agreed           :datetime
 #  diary_comments_count :integer          default(0)
 #  note_comments_count  :integer          default(0)
 #  tou_agreed           :datetime
 #  diary_comments_count :integer          default(0)
 #  note_comments_count  :integer          default(0)

+#  creation_address     :inet

 #
 # Indexes
 #
 #
 # Indexes
 #

+#  index_users_on_creation_address   (creation_address) USING gist

 #  users_auth_idx                    (auth_provider,auth_uid) UNIQUE
 #  users_display_name_canonical_idx  (lower(NORMALIZE(display_name, NFKC)))
 #  users_display_name_idx            (display_name) UNIQUE
 #  users_auth_idx                    (auth_provider,auth_uid) UNIQUE
 #  users_display_name_canonical_idx  (lower(NORMALIZE(display_name, NFKC)))
 #  users_display_name_idx            (display_name) UNIQUE


@@ -65,9 +66,8 @@ class User < ApplicationRecord
   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, :inverse_of => :author
   has_many :notes, :through => :note_comments
   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, :inverse_of => :author
   has_many :notes, :through => :note_comments

-
-  has_many :client_applications
-  has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken", :inverse_of => :user
+  has_many :note_subscriptions, :class_name => "NoteSubscription"
+  has_many :subscribed_notes, :through => :note_subscriptions, :source => :note

 
   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 :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


@@ -332,7 +332,6 @@ class User < ApplicationRecord
   ##
   # revoke any authentication tokens
   def revoke_authentication_tokens
   ##
   # revoke any authentication tokens
   def revoke_authentication_tokens

-    oauth_tokens.authorized.each(&:invalidate!)

     access_tokens.not_expired.each(&:revoke)
   end
 
     access_tokens.not_expired.each(&:revoke)
   end
 


@@ -377,12 +376,6 @@ class User < ApplicationRecord
     suspend! if may_suspend? && spam_score > Settings.spam_threshold
   end
 
     suspend! if may_suspend? && spam_score > Settings.spam_threshold
   end
 

-  ##
-  # 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)
   ##
   # return an oauth 2 access token for a specified application
   def oauth_token(application_id)


@@ -430,8 +423,8 @@ class User < ApplicationRecord
     if moderator?
       Settings.moderator_changeset_comments_per_hour
     else
     if moderator?
       Settings.moderator_changeset_comments_per_hour
     else

-      previous_comments = changeset_comments.limit(200).count
-      max_comments = previous_comments / 200.0 * Settings.max_changeset_comments_per_hour
+      previous_comments = changeset_comments.limit(Settings.comments_to_max_changeset_comments).count
+      max_comments = previous_comments / Settings.comments_to_max_changeset_comments.to_f * Settings.max_changeset_comments_per_hour

       max_comments = max_comments.floor.clamp(Settings.initial_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)
       max_comments /= 2**active_reports
       max_comments.floor.clamp(Settings.min_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)
       max_comments = max_comments.floor.clamp(Settings.initial_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)
       max_comments /= 2**active_reports
       max_comments.floor.clamp(Settings.min_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)