update user waiting notification to show meeting name

This commit is contained in:
Zachary Chai 2017-02-28 16:43:54 -05:00
parent 7bb1340fef
commit 03cae1ed19
4 changed files with 7 additions and 8 deletions

View File

@ -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+'"')
});
}
}

View File

@ -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

View File

@ -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

View File

@ -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