pass around the actual message

Author: npezza93

app/models/solid_cable/message.rb

@@ -8,7 +8,8 @@ class Message < SolidCable::Record
       where(created_at: ...::SolidCable.message_retention.ago)
     }
     scope :broadcastable, lambda { |channel_hashes, last_id|
-      where(channel_hash: channel_hashes).where(id: (last_id.to_i + 1)..).order(:id)
+      select(column_names.excluding("created_at", "updated_at")).
+        where(channel_hash: channel_hashes).where(id: (last_id.to_i + 1)..).order(:id)
     }
 
     class << self

lib/action_cable/subscription_adapter/solid_cable.rb

@@ -156,23 +156,26 @@ def channels
 
             def broadcast_messages
               ::SolidCable::Message.
-                broadcastable(channels.keys, last_id).
-                pluck(:id, :channel, :channel_hash, :payload).each do |id, channel, channel_hash, payload|
+                broadcastable(channels.keys, last_id).each do |message|
                   should_broadcast_message = false
-                  channels.compute_if_present(channel_hash) do |channel_last_id|
-                    break if channel_last_id >= id
+                  channels.compute_if_present(message.channel_hash) do |channel_last_id|
+                    break if channel_last_id >= message.id
 
                     should_broadcast_message = true
-                    id
+                    message.id
                   end
 
-                  broadcast(channel, payload) if should_broadcast_message
-                  self.last_id = id
+                  broadcast(message) if should_broadcast_message
+                  self.last_id = message.id
                 end
 
               self.reconnect_attempt = 0
             end
 
+            def broadcast(message)
+              super(message.channel, message.payload)
+            end
+
             def with_polling_volume
               if ::SolidCable.silence_polling? && ActiveRecord::Base.logger
                 ActiveRecord::Base.logger.silence { yield }

test/lib/solid_cable/batched_broadcaster_test.rb

@@ -24,7 +24,7 @@ class SolidCable::BatchedBroadcasterTest < ActiveSupport::TestCase
     end
 
     assert_equal 1, batches.size
-    assert_equal [ [ "one", "first" ], [ "two", "second" ] ], batches.pop.sort
+    assert_equal [ "one", "two" ], batches.pop.pluck(:channel).sort
   end
 
   test "rejects broadcasts after shutdown" do