combine channels for meeting updates

This commit is contained in:
Zachary Chai 2016-11-07 11:19:54 -05:00
parent b8c876443f
commit 58d5e7e6c5
4 changed files with 18 additions and 12 deletions

View File

@ -2,15 +2,20 @@
var initRooms = function() { var initRooms = function() {
App.messages = App.cable.subscriptions.create({ App.messages = App.cable.subscriptions.create({
channel: 'ModeratorJoinsChannel', channel: 'MeetingUpdatesChannel',
username: getRoomName() username: getRoomName()
}, },
{ {
received: function(data) { received: function(data) {
if (!Meeting.getInstance().getModJoined()) { if (data.action === 'moderator_joined') {
Meeting.getInstance().setModJoined(true); if (!Meeting.getInstance().getModJoined()) {
if (Meeting.getInstance().getWaitingForMod()) { Meeting.getInstance().setModJoined(true);
loopJoin(); if (Meeting.getInstance().getWaitingForMod()) {
loopJoin();
}
}
else if (data.action === 'meeting_ended') {
} }
} }
} }

View File

@ -0,0 +1,5 @@
class MeetingUpdatesChannel < ApplicationCable::Channel
def subscribed
stream_from "#{params[:username]}_meeting_updates_channel"
end
end

View File

@ -1,5 +0,0 @@
class ModeratorJoinsChannel < ApplicationCable::Channel
def subscribed
stream_from "moderator_#{params[:username]}_join_channel"
end
end

View File

@ -29,8 +29,9 @@ class BbbController < ApplicationController
) )
if bbb_res[:returncode] && current_user && current_user == user if bbb_res[:returncode] && current_user && current_user == user
ActionCable.server.broadcast "moderator_#{user.username}_join_channel", ActionCable.server.broadcast "#{user.username}_meeting_updates_channel",
moderator: "joined" action: 'moderator_joined',
moderator: 'joined'
end end
render_bbb_response bbb_res, bbb_res[:response] render_bbb_response bbb_res, bbb_res[:response]