Fix calculation of friendship rate limit

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

diff --git a/app/models/user.rb b/app/models/user.rb
index a2c0619dea9031b91a04e40230e4554c1149d64b..3dbaa688c966643a92707cd2ae7cf48586713068 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -308,10 +308,10 @@ class User < ApplicationRecord
   def max_friends_per_hour
     account_age_in_seconds = Time.now.utc - creation_time
     account_age_in_hours = account_age_in_seconds / 3600
-    recent_friends = friendships.where("created_at >= ?", Time.now.utc - 3600).count
+    recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
-    max_messages = account_age_in_hours.ceil + recent_friends - active_reports * 10
-    max_messages.clamp(0, Settings.max_friends_per_hour)
+    max_friends = account_age_in_hours.ceil + recent_friends - active_reports * 10
+    max_friends.clamp(0, Settings.max_friends_per_hour)
   end
 
   private