Rubocop autofix: ambiguous operator precedence

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

diff --git a/app/models/user.rb b/app/models/user.rb
index e7e077a9b7f20f20420ead56ddf738b8e353e914..d7bfb223541a24d2f68d33c4b7e50b7bd418a08b 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -258,7 +258,7 @@ class User < ApplicationRecord
     OSM::GreatCircle.new(home_lat, home_lon).distance(nearby_user.home_lat, nearby_user.home_lon)
   end
 
-  def is_friends_with?(new_friend)
+  def friends_with?(new_friend)
     friendships.exists?(:befriendee => new_friend)
   end
 
@@ -370,7 +370,7 @@ class User < ApplicationRecord
     account_age_in_hours = account_age_in_seconds / 3600
     recent_messages = messages.where("sent_on >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
-    max_messages = account_age_in_hours.ceil + recent_messages - active_reports * 10
+    max_messages = account_age_in_hours.ceil + recent_messages - (active_reports * 10)
     max_messages.clamp(0, Settings.max_messages_per_hour)
   end
 
@@ -379,7 +379,7 @@ class User < ApplicationRecord
     account_age_in_hours = account_age_in_seconds / 3600
     recent_friends = Friendship.where(:befriendee => self).where("created_at >= ?", Time.now.utc - 3600).count
     active_reports = issues.with_status(:open).sum(:reports_count)
-    max_friends = account_age_in_hours.ceil + recent_friends - active_reports * 10
+    max_friends = account_age_in_hours.ceil + recent_friends - (active_reports * 10)
     max_friends.clamp(0, Settings.max_friends_per_hour)
   end