Stop parameter hashes comparing equal to normal hashes

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

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


@@ -238,8 +237,12 @@ class User < ApplicationRecord
     @preferred_languages ||= Locale.list(languages)
   end
 
     @preferred_languages ||= Locale.list(languages)
   end
 

+  def home_location?
+    home_lat && home_lon
+  end
+

   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)
   def nearby(radius = Settings.nearby_radius, num = Settings.nearby_users)

-    if home_lon && home_lat
+    if home_location?

       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")
       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")


@@ -278,18 +281,18 @@ class User < ApplicationRecord
   ##
   # returns true if the user has the moderator role, false otherwise
   def moderator?
   ##
   # returns true if the user has the moderator role, false otherwise
   def moderator?

-    has_role? "moderator"
+    role? "moderator"

   end
 
   ##
   # returns true if the user has the administrator role, false otherwise
   def administrator?
   end
 
   ##
   # returns true if the user has the administrator role, false otherwise
   def administrator?

-    has_role? "administrator"
+    role? "administrator"

   end
 
   ##
   # returns true if the user has the requested role
   end
 
   ##
   # returns true if the user has the requested role

-  def has_role?(role)
+  def role?(role)

     roles.any? { |r| r.role == role }
   end
 
     roles.any? { |r| r.role == role }
   end
 


@@ -391,6 +394,19 @@ class User < ApplicationRecord
     max_friends.clamp(0, Settings.max_friends_per_hour)
   end
 
     max_friends.clamp(0, Settings.max_friends_per_hour)
   end
 

+  def max_changeset_comments_per_hour
+    if moderator?
+      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
+      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)
+    end
+  end
+

   private
 
   def encrypt_password
   private
 
   def encrypt_password


@@ -401,6 +417,6 @@ class User < ApplicationRecord
   end
 
   def update_tile
   end
 
   def update_tile

-    self.home_tile = QuadTile.tile_for_point(home_lat, home_lon) if home_lat && home_lon
+    self.home_tile = QuadTile.tile_for_point(home_lat, home_lon) if home_location?

   end
 end
   end
 end