nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for sending unlimited duplicate friend requests

Browse source
This commit is contained in:
Thomas Krehbiel 2010-09-22 18:05:11 -04:00 committed by root
parent aaa4d75a5e
commit 10e6ff9df8
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/requests_controller.rb
View file

@ -47,8 +47,8 @@ class RequestsController < ApplicationController
begin begin
@request = current_user.send_friend_request_to(rel_hash[:friend], aspect) @request = current_user.send_friend_request_to(rel_hash[:friend], aspect)
rescue Exception => e rescue Exception => e
raise e unless e.message.include? "already friends" raise e unless e.message.include? "already"
flash[:notice] = "You are already friends with #{params[:request][:destination_url]}!" flash[:notice] = "#{e.message} #{params[:request][:destination_url]}"
respond_with :location => aspect respond_with :location => aspect
return return
end end

3
lib/diaspora/user/friending.rb
View file

@ -8,6 +8,9 @@ module Diaspora
module UserModules module UserModules
module Friending module Friending
def send_friend_request_to(desired_friend, aspect) def send_friend_request_to(desired_friend, aspect)
# should have different exception types for these?
raise "You have already sent a friend request to that person!" if self.pending_requests.detect{
|x| x.destination_url == desired_friend.receive_url }
raise "You are already friends with that person!" if self.friends.detect{ raise "You are already friends with that person!" if self.friends.detect{
|x| x.receive_url == desired_friend.receive_url} |x| x.receive_url == desired_friend.receive_url}
request = Request.instantiate( request = Request.instantiate(