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

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

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