Splitting accept_friend_request into two methods

app/controllers/requests_controller.rb

@@ -8,7 +8,7 @@ class RequestsController < ApplicationController
   
   def destroy
     if params[:accept]
-      @friend = current_user.accept_friend_request( params[:id], current_user.groups.first.id)
+      @friend = current_user.accept_and_respond( params[:id], current_user.groups.first.id)
       
       flash[:notice] = "you are now friends"
       redirect_to root_url 

app/models/user.rb

@@ -63,11 +63,17 @@ class User
     activate_friend(request.person, group_by_id(group_id))
 
     request.reverse self
-
+    request
+  end
+  
+  def dispatch_friend_acceptance request
     request.push_to_url(request.callback_url)
-    
     request.destroy
   end
+  
+  def accept_and_respond(friend_request_id, group_id)
+    dispatch_friend_acceptance(accept_friend_request(friend_request_id, group_id))
+  end
 
   def ignore_friend_request(friend_request_id)
     request = Request.first(:id => friend_request_id)

db/seeds/tom.rb

@@ -22,4 +22,5 @@ user2.person.save
 # friending users
 group = user.group(:name => "other dudes")
 request = user.send_friend_request_to(user2.receive_url, group.id)
-user2.accept_friend_request request.id, user2.group(:name => "presidents").id
+reversed_request = user2.accept_friend_request( request.id, user2.group(:name => "presidents").id )
+user.receive reversed_request.to_diaspora_xml