diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index e986d6bcf..853cfc59d 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -25,8 +25,8 @@ class RequestsController < ApplicationController end def create - url = find_url(params) - @request = current_user.send_friend_request_to(params[:request][:destination_url]) + url = find_url(params[:request][:destination_url]) + @request = current_user.send_friend_request_to(url) if @request flash[:notice] = "a friend request was sent to #{@request.destination_url}" redirect_to requests_url @@ -39,13 +39,6 @@ class RequestsController < ApplicationController end - def self.diasproa_url(identifier) - if identifier.include? '@' - f = Redfinger.finger(uri) - identifier = f.each{|x| return x.link if x.rel =='http://joindiaspora.com/seed_location'} - end - identifier - end private diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb index afafca44b..c0bf4a1d8 100644 --- a/app/helpers/requests_helper.rb +++ b/app/helpers/requests_helper.rb @@ -2,7 +2,7 @@ module RequestsHelper def diaspora_url(identifier) if identifier.include? '@' f = Redfinger.finger(identifier) - identifier = f.each{|x| return x.link if x.rel =='http://joindiaspora.com/seed_location'} + identifier = f.links.each{|x| return x.href if x.rel =='http://joindiaspora.com/seed_location'} end identifier end diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb new file mode 100644 index 000000000..38d0d1cd4 --- /dev/null +++ b/spec/helpers/requests_helper_spec.rb @@ -0,0 +1,18 @@ +require File.dirname(__FILE__) + '/../spec_helper' + +include RequestsHelper + +describe RequestsHelper do + describe "profile" do + it 'should fetch the public webfinger profile on request' do + #post :create {:request => {:destination_url => 'tom@tom.joindiaspora.com'} + + url = diaspora_url('http://tom.joindiaspora.com/') + url.should == 'http://tom.joindiaspora.com/' + + + url = diaspora_url('tom@tom.joindiaspora.com') + url.should == 'http://tom.joindiaspora.com/' + end + end +end