diff --git a/app/models/post.rb b/app/models/post.rb index 0aba89918..683083b30 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -5,6 +5,7 @@ class Post include ROXML include Diaspora::Webhooks + xml_accessor :_id key :person_id, ObjectId belongs_to :person, :class_name => 'Person' diff --git a/app/models/status_message.rb b/app/models/status_message.rb index 195d5a73e..96c9c689e 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -3,7 +3,7 @@ class StatusMessage < Post xml_name :status_message xml_accessor :message - + key :message, String diff --git a/config/initializers/socket.rb b/config/initializers/socket.rb index a6e9a6aa1..de5eb3f3c 100644 --- a/config/initializers/socket.rb +++ b/config/initializers/socket.rb @@ -15,10 +15,9 @@ module WebSocket EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080, :debug =>false) do |ws| ws.onopen { - puts ws.request['Cookie'] sid = @channel.subscribe { |msg| ws.send msg } - ws.onmessage { |msg| puts msg}#@channel.push msg; puts msg} + ws.onmessage { |msg|}#@channel.push msg; puts msg} ws.onclose { @channel.unsubscribe(sid) } } @@ -30,18 +29,12 @@ module WebSocket end def self.view_hash(object) - #begin - # puts "I be working hard" v = WebSocket.view_for(object) - #puts view.inspect - #rescue - # puts "in failzord " + view.inspect - # raise "i suck" - #end + puts v {:class =>object.class.to_s.underscore.pluralize, :html => v} end def self.view_for(object) @view.render @view.type_partial(object), :post => object end -end \ No newline at end of file +end