From a449afca8e7e35e60ffcbd747c6b448f38f5292d Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 9 Sep 2010 17:07:40 -0700 Subject: [PATCH] RS IZ salmon back friend acceptances --- lib/diaspora/user/friending.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb index 781eb756a..37665fcf6 100644 --- a/lib/diaspora/user/friending.rb +++ b/lib/diaspora/user/friending.rb @@ -31,13 +31,15 @@ module Diaspora request end - def dispatch_friend_acceptance(request) - request.push_to_url(request.callback_url) + def dispatch_friend_acceptance(request, requester) + salmon request, :to => requester request.destroy unless request.callback_url.include? url end def accept_and_respond(friend_request_id, group_id) - dispatch_friend_acceptance(accept_friend_request(friend_request_id, group_id)) + requester = Request.find_by_id(friend_request_id).person + reversed_request = accept_friend_request(friend_request_id, group_id) + dispatch_friend_acceptance reversed_request, requester end def ignore_friend_request(friend_request_id)