X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6ec3bbc60fad0332abb9ea1325c408b45f098f9..42224790b56acea5c653f3085c374f28d56e590d:/app/controllers/friendships_controller.rb?ds=sidebyside diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb index 3ca24d34b..8f0c1ad85 100644 --- a/app/controllers/friendships_controller.rb +++ b/app/controllers/friendships_controller.rb @@ -1,4 +1,6 @@ class FriendshipsController < ApplicationController + include UserMethods + 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 - 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