From 2e87bece60299ffeb12780b27e87408817396fab Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 2 Dec 2010 19:03:15 -0800
Subject: [PATCH] Final fixes for person socketing

---
 app/helpers/sockets_helper.rb       |  2 +-
 app/models/jobs/socket_webfinger.rb |  6 +++++-
 lib/diaspora/web_socket.rb          |  2 +-
 lib/tasks/resque.rake               | 14 ++++++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 0c61f4bf6..42c6e78a4 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -27,7 +27,7 @@ module SocketsHelper
         v = render_to_string(:partial => 'shared/stream_element', :locals => post_hash)
       elsif object.is_a? Person
         person_hash = {
-          :single_aspect_form => opts[:single_aspect_form], 
+          :single_aspect_form => opts["single_aspect_form"], 
           :person => object,
           :aspects => user.aspects,
           :contact => user.contact_for(object),
diff --git a/app/models/jobs/socket_webfinger.rb b/app/models/jobs/socket_webfinger.rb
index b6ecdf451..edad56451 100644
--- a/app/models/jobs/socket_webfinger.rb
+++ b/app/models/jobs/socket_webfinger.rb
@@ -7,7 +7,11 @@ module Jobs
         result = finger.fetch
         result.socket_to_uid(user_id, opts)
       rescue
-        Diaspora::WebSocket.queue_to_user(user_id, {:class => 'people', :status => 'fail', :query => account, :response => I18n.t('people.webfinger.fail')}.to_json)
+        Diaspora::WebSocket.queue_to_user(user_id, 
+          {:class => 'people',
+           :status => 'fail',
+           :query => account,
+           :response => I18n.t('people.webfinger.fail', :handle => account)}.to_json)
       end
     end
   end
diff --git a/lib/diaspora/web_socket.rb b/lib/diaspora/web_socket.rb
index 2fec38d39..19888ebef 100644
--- a/lib/diaspora/web_socket.rb
+++ b/lib/diaspora/web_socket.rb
@@ -15,7 +15,7 @@ module Diaspora
 
     def self.push_to_user(uid, data)
       Rails.logger.debug "Websocketing to #{uid}"
-      @channels[uid][0].push(data) if @channels[uid]
+      @channels[uid.to_id][0].push(data) if @channels[uid.to_id]
     end
 
     def self.subscribe(uid, ws)
diff --git a/lib/tasks/resque.rake b/lib/tasks/resque.rake
index df7c365fb..8bd95d372 100644
--- a/lib/tasks/resque.rake
+++ b/lib/tasks/resque.rake
@@ -1,7 +1,17 @@
 require 'resque/tasks'
 task "resque:setup" => :environment do
-  Dir[File.join(Rails.root, 'app', 'uploaders', '*.rb')].each { |file| require file }
-  Dir[File.join(Rails.root, 'app', 'models', '*.rb')].each { |file| require file }
+  Dir[File.join(Rails.root, 'app', 'uploaders', '*.rb')].each { |file|
+    classname = File.basename(file)[0..-4].camelize.constantize
+    unless defined?(classname)
+      require file 
+    end
+  }
+  Dir[File.join(Rails.root, 'app', 'models', '*.rb')].each { |file| 
+    classname = File.basename(file)[0..-4].camelize.constantize
+    unless defined?(classname)
+      require file 
+    end
+  }
   require File.join(Rails.root, 'app', 'controllers', 'application_controller.rb')
   require File.join(Rails.root, 'app', 'controllers', 'sockets_controller.rb')
   Rails.logger.info("event=resque_setup rails_env=#{Rails.env}")