Get websocket pushing posts
This commit is contained in:
parent
f3b7cf1391
commit
4de2ca9958
2 changed files with 7 additions and 4 deletions
|
|
@ -7,7 +7,7 @@ class SocketsController < ApplicationController
|
|||
include SocketsHelper
|
||||
include Rails.application.routes.url_helpers
|
||||
helper_method :all_aspects
|
||||
|
||||
helper_method :current_user
|
||||
|
||||
def incoming(msg)
|
||||
Rails.logger.info("Socket received connection to: #{msg}")
|
||||
|
|
@ -33,11 +33,14 @@ class SocketsController < ApplicationController
|
|||
@user ||= ((@params[:user_or_id].instance_of? User )? @params[:user_or_id] : User.find(user_id))
|
||||
end
|
||||
|
||||
helper_method :current_user
|
||||
def current_user
|
||||
user
|
||||
end
|
||||
|
||||
def url_options
|
||||
{:host => "#{AppConfig[:pod_uri].host}:#{AppConfig[:pod_uri].port}"}
|
||||
end
|
||||
|
||||
def all_aspects
|
||||
@all_aspects ||= user.aspects
|
||||
end
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ module SocketsHelper
|
|||
raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction
|
||||
end
|
||||
rescue Exception => e
|
||||
Rails.logger.error(:event => :socket_render, :status => :fail, :user => user.diaspora_handle, :object=> object.id, :object_class => object.class)
|
||||
Rails.logger.error(:event => :socket_render, :status => :fail, :user => user.diaspora_handle, :object=> object.id, :object_class => object.class, :error_message => e.message)
|
||||
raise e
|
||||
end
|
||||
action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
|
||||
|
|
|
|||
Loading…
Reference in a new issue