diff --git a/server/handlers/functions.js b/server/handlers/functions.js index 75da87e5..8e26009d 100644 --- a/server/handlers/functions.js +++ b/server/handlers/functions.js @@ -252,6 +252,22 @@ function getSessionChatPass(id, callback) { } } + +function setChromecastHost(id, other_id, callback) { + try { + if(id == "empty" || id == undefined) { + callback(); + return; + } + connected_db.collection(id).update({_id: list}, {"chromecast": true, id: id}, {upsert: true}, function(e, docs) { + callback(true); + return; + }); + } catch(e) { + callback(false); + } +} + function setSessionUserPass(id, userpass, list, callback) { try { if(id == "empty" || id == undefined) { @@ -277,10 +293,16 @@ function getSessionAdminUser(id, list, callback) { var userpass = ""; var adminpass = ""; if(d.length > 0) { - if(d[0].userpass != undefined) userpass = d[0].userpass; - if(d[0].adminpass != undefined) adminpass = d[0].adminpass; + if(d.hasOwnProperty("chromecast") && d.chromecast) { + getSessionAdminUser(d.id, list, callback); + } else { + if(d[0].userpass != undefined) userpass = d[0].userpass; + if(d[0].adminpass != undefined) adminpass = d[0].adminpass; + callback(userpass, adminpass, true); + } + } else { + callback(userpass, adminpass, true); } - callback(userpass, adminpass, true); }) } catch(e) { callback("", "", false); diff --git a/server/handlers/io.js b/server/handlers/io.js index d10d9498..add346fc 100644 --- a/server/handlers/io.js +++ b/server/handlers/io.js @@ -89,6 +89,9 @@ module.exports = function() { db.collection("connected_users").find({"_id": msg.channel}, function(err, connected_users_channel) { console.log("test: ", connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1, connected_users_channel.length > 0, connected_users_channel[0].users.indexOf(msg.guid) > -1, connected_users_channel) if(connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1) { + Functions.setChromecastHost(socket.cookie_id, msg.guid, function(results) { + console.log("setChromecastHost: ", results); + }); socket.cookie_id = msg.guid; guid = msg.guid; socketid = msg.socket_id; @@ -96,6 +99,7 @@ module.exports = function() { if(msg.hasOwnProperty("channel")) { msg.channel = Functions.encodeChannelName(msg.channel); } + coll = msg.channel.toLowerCase();//.replace(/ /g,''); coll = Functions.removeEmojis(coll).toLowerCase(); coll = filter.clean(coll); diff --git a/server/routing/client/router.js b/server/routing/client/router.js index 76fbc1a2..81bd6529 100644 --- a/server/routing/client/router.js +++ b/server/routing/client/router.js @@ -34,12 +34,10 @@ try { } router.use(recaptcha.middleware.render, function(req, res, next) { - console.log("middleware render"); next(); // make sure we go to the next routes and don't stop here }); router.route('/:channel_name').get(function(req, res, next){ - console.log("channel_name get"); channel(req, res, next); }); @@ -49,12 +47,10 @@ router.route('/r/:base64data').get(function(req, res, next){ }); router.route('/').get(function(req, res, next){ - console.log("/ get"); root(req, res, next); }); router.route('/').post(function(req, res, next){ - console.log("/ post"); root(req, res, next); });