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

[rails.git] / app / controllers / friendships_controller.rb

diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index 3ca24d34b4a2fa2c739c51bc7ab51079a3ea8a80..8f0c1ad859c4332eb46c81d82db4e28d6a8fe755 100644 (file)
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -1,4 +1,6 @@
 class FriendshipsController < ApplicationController
 class FriendshipsController < ApplicationController

+  include UserMethods
+

   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web


@@ -17,8 +19,8 @@ class FriendshipsController < ApplicationController
       friendship.befriendee = @friend
       if current_user.friends_with?(@friend)
         flash[:warning] = t ".already_a_friend", :name => @friend.display_name
       friendship.befriendee = @friend
       if current_user.friends_with?(@friend)
         flash[:warning] = t ".already_a_friend", :name => @friend.display_name

-      elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour
-        flash.now[:error] = t ".limit_exceeded"
+      elsif current_user.friendships.where(:created_at => Time.now.utc - 1.hour..).count >= current_user.max_friends_per_hour
+        flash[:error] = t ".limit_exceeded"

       elsif friendship.save
         flash[:notice] = t ".success", :name => @friend.display_name
         UserMailer.friendship_notification(friendship).deliver_later
       elsif friendship.save
         flash[:notice] = t ".success", :name => @friend.display_name
         UserMailer.friendship_notification(friendship).deliver_later