Adjust sizes of changeset element headers/pagination

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

diff --git a/app/models/user.rb b/app/models/user.rb
index fe2a98d61e31f6af42e6a085bdcf19e93a21d546..7571dd9dc5c8011f4615ebf970b6f0daa377adc9 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -12,7 +12,6 @@
 #  home_lat            :float
 #  home_lon            :float
 #  home_zoom           :integer          default(3)
 #  home_lat            :float
 #  home_lon            :float
 #  home_zoom           :integer          default(3)

-#  nearby              :integer          default(50)

 #  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


@@ -116,6 +115,7 @@ class User < ApplicationRecord
 
   alias_attribute :created_at, :creation_time
 
 
   alias_attribute :created_at, :creation_time
 

+  after_initialize :encrypt_password

   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check
   before_save :encrypt_password
   before_save :update_tile
   after_save :spam_check


@@ -291,6 +291,12 @@ class User < ApplicationRecord
     role? "administrator"
   end
 
     role? "administrator"
   end
 

+  ##
+  # returns true if the user has the importer role, false otherwise
+  def importer?
+    role? "importer"
+  end
+

   ##
   # returns true if the user has the requested role
   def role?(role)
   ##
   # returns true if the user has the requested role
   def role?(role)


@@ -377,11 +383,18 @@ class User < ApplicationRecord
     digest.hexdigest
   end
 
     digest.hexdigest
   end
 

+  def active_reports
+    issues
+      .with_status(:open)
+      .joins(:reports)
+      .where("reports.updated_at >= COALESCE(issues.resolved_at, '1970-01-01')")
+      .count
+  end
+

   def max_messages_per_hour
     account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
   def max_messages_per_hour
     account_age_in_seconds = Time.now.utc - created_at
     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
     max_messages = account_age_in_hours.ceil + recent_messages - (active_reports * 10)
     max_messages.clamp(0, Settings.max_messages_per_hour)
   end


@@ -390,21 +403,19 @@ class User < ApplicationRecord
     account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     account_age_in_seconds = Time.now.utc - created_at
     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
 
   def max_changeset_comments_per_hour
     if moderator?
     max_friends = account_age_in_hours.ceil + recent_friends - (active_reports * 10)
     max_friends.clamp(0, Settings.max_friends_per_hour)
   end
 
   def max_changeset_comments_per_hour
     if moderator?

-      36000
+      Settings.moderator_changeset_comments_per_hour

     else
       previous_comments = changeset_comments.limit(200).count
     else
       previous_comments = changeset_comments.limit(200).count

-      active_reports = issues.with_status(:open).sum(:reports_count)

       max_comments = previous_comments / 200.0 * Settings.max_changeset_comments_per_hour
       max_comments = previous_comments / 200.0 * Settings.max_changeset_comments_per_hour

-      max_comments = 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 /= 2**active_reports

-      max_comments.floor.clamp(1, Settings.max_changeset_comments_per_hour)
+      max_comments.floor.clamp(Settings.min_changeset_comments_per_hour, Settings.max_changeset_comments_per_hour)

     end
   end
 
     end
   end