Merge branch 'develop' into heatmap-last-30-days

app/jobs/action_cable_broadcast_job.rb

@@ -2,8 +2,34 @@ class ActionCableBroadcastJob < ApplicationJob
   queue_as :critical
 
   def perform(members, event_name, data)
+    return if members.blank?
+
+    broadcast_data = prepare_broadcast_data(event_name, data)
+    broadcast_to_members(members, event_name, broadcast_data)
+  end
+
+  private
+
+  # Ensures that only the latest available data is sent to prevent UI issues
+  # caused by out-of-order events during high-traffic periods. This prevents
+  # the conversation job from processing outdated data.
+  def prepare_broadcast_data(event_name, data)
+    return data unless event_name == 'conversation.updated'
+
+    account = Account.find(data[:account_id])
+    conversation = account.conversations.find_by!(display_id: data[:id])
+    conversation.push_event_data.merge(account_id: data[:account_id])
+  end
+
+  def broadcast_to_members(members, event_name, broadcast_data)
     members.each do |member|
-      ActionCable.server.broadcast(member, { event: event_name, data: data })
+      ActionCable.server.broadcast(
+        member,
+        {
+          event: event_name,
+          data: broadcast_data
+        }
+      )
     end
   end
 end