From 9603d718c201f603942fc4c04bbc84d52983a6e3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 11 May 2021 15:49:48 +0100 Subject: [PATCH] Fix calculation of friendship rate limit --- app/models/user.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index a2c0619de..3dbaa688c 100644 --- 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 -- 2.45.1