From 05e6dada58f0ec0360dfa1dac4d982bce19c00b7 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 16 Jul 2010 09:59:06 -0700 Subject: [PATCH 1/4] Fixing deploy friending --- app/controllers/dashboards_controller.rb | 28 +++++++++++++++--------- config/routes.rb | 1 + 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index aa0780f87..7645bba17 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -36,17 +36,17 @@ class DashboardsController < ApplicationController def zombiefriends render :nothing => true - backer_info = ["http://washington.joindiaspora.com/", - "http://adams.joindiaspora.com/", - "http://jefferson.joindiaspora.com/", - "http://madison.joindiaspora.com/", - "http://monroe.joindiaspora.com/", + backer_info = ["http://washington.joindiaspora.com/", + "http://adams.joindiaspora.com/", + "http://jefferson.joindiaspora.com/", + "http://madison.joindiaspora.com/", + "http://monroe.joindiaspora.com/", "http://quincyadams.joindiaspora.com/", - "http://jackson.joindiaspora.com/", - "http://buren.joindiaspora.com/", - "http://harrison.joindiaspora.com/", - "http://tyler.joindiaspora.com/", - "http://polk.joindiaspora.com/", + "http://jackson.joindiaspora.com/", + "http://buren.joindiaspora.com/", + "http://harrison.joindiaspora.com/", + "http://tyler.joindiaspora.com/", + "http://polk.joindiaspora.com/", #"http://taylor.joindiaspora.com/", #"http://fillmore.joindiaspora.com/", #"http://pierce.joindiaspora.com/", @@ -59,4 +59,12 @@ class DashboardsController < ApplicationController end end end + + def zombiefriendaccept + + Request.all.each{|r| + User.owner.accept_friend_request(r.id) + } + end + end diff --git a/config/routes.rb b/config/routes.rb index 9117e42e1..e1ca70581 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,7 @@ Diaspora::Application.routes.draw do |map| match 'warzombie', :to => "dashboards#warzombie" match 'zombiefriends', :to => "dashboards#zombiefriends" + match 'zombiefriendaccept', :to => "dashboards#zombiefriendaccept" #routes for devise, not really sure you will need to mess with this in the future, lets put default, #non mutable stuff in anohter file From 567d3f4dc58a826b3025cba9426d2ccbaf2c5776 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 16 Jul 2010 10:06:29 -0700 Subject: [PATCH 2/4] Fixing friending deploy --- app/controllers/dashboards_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index 7645bba17..8264212a9 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -61,7 +61,7 @@ class DashboardsController < ApplicationController end def zombiefriendaccept - + render :nothing => true Request.all.each{|r| User.owner.accept_friend_request(r.id) } From 4178a78b2364e8f70ce6301346cf62b97bf9a00b Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 16 Jul 2010 10:18:45 -0700 Subject: [PATCH 3/4] Logger in receive friend request --- app/models/user.rb | 1 + db/seeds/backer.rb | 1 - db/seeds/request.rb | 6 ------ lib/tasks/db.rake | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 db/seeds/request.rb 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' From 9f90ae4db0ef84b349e3e57f7ac7e324d019f4a2 Mon Sep 17 00:00:00 2001 From: Raphael Date: Fri, 16 Jul 2010 10:20:41 -0700 Subject: [PATCH 4/4] Syntax errors are awesome --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 2f25fff82..178bd440b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -56,7 +56,7 @@ class User < Person end def receive_friend_request(friend_request) - logger.info("receiving friend request #{friend_request.to_json}" + 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