From 4f22222b300c242c4f344d0400b42b0153057d54 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 16 Aug 2010 12:10:23 -0700 Subject: [PATCH] Splitting accept_friend_request into two methods --- app/controllers/requests_controller.rb | 2 +- app/models/user.rb | 10 ++++++++-- db/seeds/tom.rb | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 4caff37f4..705e781b6 100644 --- a/app/controllers/requests_controller.rb +++ b/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 diff --git a/app/models/user.rb b/app/models/user.rb index b086535b2..1de2d3e76 100644 --- a/app/models/user.rb +++ b/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) diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index 6f3e84582..d3aa7289b 100644 --- a/db/seeds/tom.rb +++ b/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