From bf53ad9f5849f6087ff6b265b9174490af8284fb Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Thu, 17 Mar 2011 15:50:07 -0700 Subject: [PATCH] Don't socket the unsocketable --- app/controllers/sockets_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb index 7ed70b1cb..cd9cbc2b1 100644 --- a/app/controllers/sockets_controller.rb +++ b/app/controllers/sockets_controller.rb @@ -18,7 +18,7 @@ class SocketsController < ApplicationController user_id = user_or_id.id @user = user_or_id end - return unless Diaspora::WebSocket.is_connected?(user_id) + return unless Diaspora::WebSocket.is_connected?(user_id) && object.respond_to?(:socket_to_user) @_request = ActionDispatch::Request.new({}) Diaspora::WebSocket.queue_to_user(user_id, action_hash(@user || User.find(user_id), object, opts)) end