diff --git a/app/models/user.rb b/app/models/user.rb index a9cdf0cd8..2f25fff82 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,6 +56,7 @@ class User < Person end def receive_friend_request(friend_request) + logger.info("receiving friend request #{friend_request.to_json}" GPGME.import(friend_request.exported_key) if Request.where(:callback_url => friend_request.callback_url).first friend_request.activate_friend diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index 03254e3b9..beb6fd9f0 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -59,7 +59,6 @@ def create(backer_number) :url=> "#{username}.joindiaspora.com") # Make connection with Diaspora Tom - User.owner.send_friend_request_to('http://tom.joindiaspora.com/') #Person.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :active => true, :profile => Profile.new(:first_name => "Alexander", :last_name => "Hamiltom")) # Make people diff --git a/db/seeds/request.rb b/db/seeds/request.rb deleted file mode 100644 index b0c652ca8..000000000 --- a/db/seeds/request.rb +++ /dev/null @@ -1,6 +0,0 @@ - -require 'config/environment' - -Request.all.each{|r| - User.owner.accept_friend_request(r.id) -} diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake index dbcd29617..deba4529d 100644 --- a/lib/tasks/db.rake +++ b/lib/tasks/db.rake @@ -18,11 +18,6 @@ namespace :db do end end - task :accept_requests do - puts "Accepting all friend requests for #{Rails.env}" - require 'db/seeds/request' - end - desc 'Delete the collections in the current RAILS_ENV database' task :purge do require 'config/environment'