From 58d5e7e6c5129389ad35ca6523b4ddcb5b03be9a Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Mon, 7 Nov 2016 11:19:54 -0500
Subject: [PATCH] combine channels for meeting updates

---
 .../{moderator_joins.js => meeting_updates.js}    | 15 ++++++++++-----
 app/channels/meeting_updates_channel.rb           |  5 +++++
 app/channels/moderator_joins_channel.rb           |  5 -----
 app/controllers/bbb_controller.rb                 |  5 +++--
 4 files changed, 18 insertions(+), 12 deletions(-)
 rename app/assets/javascripts/channels/{moderator_joins.js => meeting_updates.js} (53%)
 create mode 100644 app/channels/meeting_updates_channel.rb
 delete mode 100644 app/channels/moderator_joins_channel.rb

diff --git a/app/assets/javascripts/channels/moderator_joins.js b/app/assets/javascripts/channels/meeting_updates.js
similarity index 53%
rename from app/assets/javascripts/channels/moderator_joins.js
rename to app/assets/javascripts/channels/meeting_updates.js
index fdea002c..f2d3664e 100644
--- a/app/assets/javascripts/channels/moderator_joins.js
+++ b/app/assets/javascripts/channels/meeting_updates.js
@@ -2,15 +2,20 @@
 
   var initRooms = function() {
     App.messages = App.cable.subscriptions.create({
-      channel: 'ModeratorJoinsChannel',
+      channel: 'MeetingUpdatesChannel',
       username: getRoomName()
     },
     {
       received: function(data) {
-        if (!Meeting.getInstance().getModJoined()) {
-          Meeting.getInstance().setModJoined(true);
-          if (Meeting.getInstance().getWaitingForMod()) {
-            loopJoin();
+        if (data.action === 'moderator_joined') {
+          if (!Meeting.getInstance().getModJoined()) {
+            Meeting.getInstance().setModJoined(true);
+            if (Meeting.getInstance().getWaitingForMod()) {
+              loopJoin();
+            }
+          }
+          else if (data.action === 'meeting_ended') {
+
           }
         }
       }
diff --git a/app/channels/meeting_updates_channel.rb b/app/channels/meeting_updates_channel.rb
new file mode 100644
index 00000000..8e48fba0
--- /dev/null
+++ b/app/channels/meeting_updates_channel.rb
@@ -0,0 +1,5 @@
+class MeetingUpdatesChannel < ApplicationCable::Channel
+  def subscribed
+    stream_from "#{params[:username]}_meeting_updates_channel"
+  end
+end
diff --git a/app/channels/moderator_joins_channel.rb b/app/channels/moderator_joins_channel.rb
deleted file mode 100644
index 1d5cd143..00000000
--- a/app/channels/moderator_joins_channel.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ModeratorJoinsChannel < ApplicationCable::Channel
-  def subscribed
-    stream_from "moderator_#{params[:username]}_join_channel"
-  end
-end
diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
index 65e73542..4c9c24ec 100644
--- a/app/controllers/bbb_controller.rb
+++ b/app/controllers/bbb_controller.rb
@@ -29,8 +29,9 @@ class BbbController < ApplicationController
       )
 
       if bbb_res[:returncode] && current_user && current_user == user
-        ActionCable.server.broadcast "moderator_#{user.username}_join_channel",
-          moderator: "joined"
+        ActionCable.server.broadcast "#{user.username}_meeting_updates_channel",
+          action: 'moderator_joined',
+          moderator: 'joined'
       end
 
       render_bbb_response bbb_res, bbb_res[:response]