Use an HTML5 parser for tests

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

diff --git a/app/models/user.rb b/app/models/user.rb
index fe2a98d61e31f6af42e6a085bdcf19e93a21d546..638928861bd1caed18ac837c0390b115a15b3ce6 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


@@ -397,14 +396,14 @@ class User < ApplicationRecord
 
   def max_changeset_comments_per_hour
     if moderator?
 
   def max_changeset_comments_per_hour
     if moderator?

-      36000
+      Settings.moderator_changeset_comments_per_hour

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