Merge pull request #136 from zach-chai/update_notification

update user waiting notification to show meeting name

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

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

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