Rename friends rate limit as follows

diff --git a/app/controllers/follows_controller.rb b/app/controllers/follows_controller.rb
index 0d8ee272a77a78c8d499e093e632715611827fa6..39d6191cd80445330b9ec56ec5d59b3cd43293b4 100644 (file)
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -22,7 +22,7 @@ class FollowsController < ApplicationController
     follow.following = @friend
     if current_user.follows?(@friend)
       flash[:warning] = t ".already_followed", :name => @friend.display_name
     follow.following = @friend
     if current_user.follows?(@friend)
       flash[:warning] = t ".already_followed", :name => @friend.display_name

-    elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour
+    elsif current_user.follows.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_follows_per_hour

       flash[:error] = t ".limit_exceeded"
     elsif follow.save
       flash[:notice] = t ".success", :name => @friend.display_name
       flash[:error] = t ".limit_exceeded"
     elsif follow.save
       flash[:notice] = t ".success", :name => @friend.display_name

diff --git a/app/models/user.rb b/app/models/user.rb
index 92664a76398f53ab6cc7da7b040a8ffe67738d47..16f733c882d30f002f3e7765c703d9bf7bf5254f 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -411,12 +411,12 @@ class User < ApplicationRecord
     max_messages.clamp(0, Settings.max_messages_per_hour)
   end
 
     max_messages.clamp(0, Settings.max_messages_per_hour)
   end
 

-  def max_friends_per_hour
+  def max_follows_per_hour

     account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600
     account_age_in_seconds = Time.now.utc - created_at
     account_age_in_hours = account_age_in_seconds / 3600

-    recent_friends = Follow.where(:following => self).where(:created_at => Time.now.utc - 3600..).count
-    max_friends = account_age_in_hours.ceil + recent_friends - (active_reports * 10)
-    max_friends.clamp(0, Settings.max_friends_per_hour)
+    recent_follows = Follow.where(:following => self).where(:created_at => Time.now.utc - 3600..).count
+    max_follows = account_age_in_hours.ceil + recent_follows - (active_reports * 10)
+    max_follows.clamp(0, Settings.max_follows_per_hour)

   end
 
   def max_changeset_comments_per_hour
   end
 
   def max_changeset_comments_per_hour

diff --git a/config/settings.yml b/config/settings.yml
index db871775e784d4cfe5ceb29a71bfbdee7c89b2ed..c79199145163359dd3a7efbc6dcb6e539c4037e1 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -63,8 +63,8 @@ max_messages_per_hour: 60
 default_message_query_limit: 100
 # Maximum number of messages returned by inbox and outbox message api
 max_message_query_limit: 100
 default_message_query_limit: 100
 # Maximum number of messages returned by inbox and outbox message api
 max_message_query_limit: 100

-# Rate limit for friending
-max_friends_per_hour: 60
+# Rate limit for following
+max_follows_per_hour: 60

 # Rate limit for changeset comments
 min_changeset_comments_per_hour: 1
 initial_changeset_comments_per_hour: 6
 # Rate limit for changeset comments
 min_changeset_comments_per_hour: 1
 initial_changeset_comments_per_hour: 6

diff --git a/test/system/follows_test.rb b/test/system/follows_test.rb
index f9f00ff7ffa2b41bfc8a3630e281eebe5004f05d..176a59428fe91ce29ab4dcee193e5fd6132250dc 100644 (file)
--- a/test/system/follows_test.rb
+++ b/test/system/follows_test.rb
@@ -6,7 +6,7 @@ class FollowsTest < ApplicationSystemTestCase
 
     sign_in_as create(:user)
 
 
     sign_in_as create(:user)
 

-    with_settings(:max_friends_per_hour => 0) do
+    with_settings(:max_follows_per_hour => 0) do

       visit user_path(following)
       assert_link "Follow"
 
       visit user_path(following)
       assert_link "Follow"