X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6ec3bbc60fad0332abb9ea1325c408b45f098f9..f2ca25b75c57ab772a8f9063bea82a6bc43fed78:/app/controllers/friendships_controller.rb diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb index 3ca24d34b..ab54cbfd1 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,7 +19,7 @@ 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 + 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 friendship.save flash[:notice] = t ".success", :name => @friend.display_name