diff --git a/app/assets/javascripts/channels/meeting_updates.js b/app/assets/javascripts/channels/meeting_updates.js index a3ce7157..505cf143 100644 --- a/app/assets/javascripts/channels/meeting_updates.js +++ b/app/assets/javascripts/channels/meeting_updates.js @@ -52,7 +52,7 @@ // show a browser notification only to the owner if (isRoomOwner()) { showNotification(I18n.user_waiting_title, { - body: I18n.user_waiting_body.replace(/%{user}/, data.user) + body: I18n.user_waiting_body.replace(/%{user}/, data.user).replace(/%{meeting}/, '"'+data.meeting_name+'"') }); } } diff --git a/app/jobs/notify_user_waiting_job.rb b/app/jobs/notify_user_waiting_job.rb index d36ca411..b52f108e 100644 --- a/app/jobs/notify_user_waiting_job.rb +++ b/app/jobs/notify_user_waiting_job.rb @@ -18,9 +18,8 @@ class NotifyUserWaitingJob < ApplicationJob queue_as :default def perform(room, meeting, user) - ActionCable.server.broadcast "#{room}-#{meeting}_meeting_updates_channel", - { action: 'user_waiting', user: user } - ActionCable.server.broadcast "#{room}_meeting_updates_channel", - { action: 'user_waiting', user: user } + payload = { action: 'user_waiting', user: user, meeting_name: meeting } + ActionCable.server.broadcast "#{room}-#{meeting}_meeting_updates_channel", payload + ActionCable.server.broadcast "#{room}_meeting_updates_channel", payload end end diff --git a/app/jobs/recording_created_job.rb b/app/jobs/recording_created_job.rb index c03d6c86..00f62476 100644 --- a/app/jobs/recording_created_job.rb +++ b/app/jobs/recording_created_job.rb @@ -22,7 +22,7 @@ class RecordingCreatedJob < ApplicationJob def perform(token, room, recording) ActionCable.server.broadcast "#{room}_recording_updates_channel", { action: 'create' }.merge(recording) - ActionCable.server.broadcast "#{token}_recording_updates_channel", - { action: 'create' }.merge(recording) + ActionCable.server.broadcast "#{token}_recording_updates_channel", + { action: 'create' }.merge(recording) end end diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 188dc2f8..ae8ca32b 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -60,7 +60,7 @@ en-US: unpublish_recording: Hide recording unlisted: Unlisted unpublished: No one - user_waiting_body: "%{user} is waiting to join your room!" + user_waiting_body: "%{user} is waiting to join %{meeting}!" user_waiting_title: A user is waiting copied: Copied copy_error: Use Ctrl-c to copy