KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working handlebars

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-02 17:25:21 +02:00
parent 9f3e2fddb9
commit d40e0d0080
12 changed files with 135 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/package.json
View File

@@ -5,6 +5,7 @@
"dependencies": {
"bad-words": "^1.5.1",
"body-parser": "^1.17.1",
"cookie-parser": "^1.4.3",
"cors-anywhere": "^0.2.3",
"emoji-strip": "^0.0.3",
"express": "^4.15.2",
@@ -17,7 +18,8 @@
"node-cryptojs-aes": "^0.4.0",
"request": "^2.72.0",
"sendmail": "^1.1.1",
"socket.io": "^1.7.3"
"socket.io": "^1.7.3",
"uniqid": "^4.1.1"
},
"repository": {
"type": "git",

64
server/router.js
View File

@@ -8,12 +8,21 @@ router.use(function(req, res, next) {
});
router.route('/:channel_name').get(function(req, res, next){
if(req.headers.host.split(".")[0] == "remote") {
var protocol = req.protocol;
var subdomain = req.headers['x-forwarded-host'].split(".");
if((subdomain[0] != 'localhost' && !(subdomain.length >= 2 && subdomain[1] == 'localhost')) && protocol != "https") {
res.redirect("https://zoff.me");
return;
}
if(subdomain[0] == "remote") {
var data = {
year: 2017,
javascript_file: "remote.min.js"
}
res.render('layouts/remote', data);
} else if(subdomain.length >= 2 && subdomain[0] == "www") {
res.redirect("https://zoff.me");
} else {
if(req.params.channel_name == "_embed") {
res.sendFile(path.join(__dirname, '/views/assets/html/embed.html'));
@@ -21,7 +30,7 @@ router.route('/:channel_name').get(function(req, res, next){
res.sendFile(path.join(__dirname, '/views/assets/html/callback.html'));
} else {
var data = {
list_name: req.params.channel_name,
list_name: capitalizeFirstLetter(req.params.channel_name),
year: 2017,
javascript_file: "main.min.js"
}
@@ -41,9 +50,45 @@ router.route('/api/imageblob').post(function(req, res) {
});
});
/*
*
* TODO:
*
* Add custom userplaylists, only visible for those with that specific cookie
*
*
router.route('/:user_name/:channel_name').get(function(req, res, next){
var protocol = req.protocol;
var subdomain = req.headers['x-forwarded-host'].split(".");
if((subdomain[0] != 'localhost' && !(subdomain.length >= 2 && subdomain[1] == 'localhost')) && protocol != "https") {
res.redirect("https://zoff.me");
return;
}
if(subdomain[0] == "remote") {
var data = {
year: 2017,
javascript_file: "remote.min.js"
}
res.render('layouts/remote', data);
} else if(subdomain.length >= 2 && subdomain[0] == "www") {
res.redirect("https://zoff.me");
} else {
if(req.params.channel_name == "_embed") {
res.sendFile(path.join(__dirname, '/views/assets/html/embed.html'));
} else if(req.params.channel_name == "o_callback") {
res.sendFile(path.join(__dirname, '/views/assets/html/callback.html'));
} else {
var data = {
list_name: capitalizeFirstLetter(req.params.channel_name),
year: 2017,
javascript_file: "main.min.js"
}
res.render('layouts/channel', data);
}
}
});
*/
router.route('/api/mail').post(function(req, res) {
var from = req.body.from;
@@ -63,12 +108,21 @@ router.route('/api/mail').post(function(req, res) {
});
router.route('/').get(function(req, res, next){
if(req.headers.host.split(".")[0] == "remote") {
var protocol = req.protocol;
var subdomain = req.headers['x-forwarded-host'].split(".");
if((subdomain[0] != 'localhost' && !(subdomain.length >= 2 && subdomain[1] == 'localhost')) && protocol != "https") {
res.redirect("https://zoff.me");
return;
}
if(subdomain[0] == "remote") {
var data = {
year: 2017,
javascript_file: "remote.min.js"
}
res.render('layouts/remote', data);
} else if(subdomain.length >= 2 && subdomain[0] == "www") {
res.redirect("https://zoff.me");
} else {
var data = {
year: 2017,
@@ -78,4 +132,8 @@ router.route('/').get(function(req, res, next){
}
});
function capitalizeFirstLetter(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
}
module.exports = router;

54
server/server.js
View File

@@ -3,20 +3,16 @@ var add = "";
var express = require('express');
var app = express();
var exphbs = require('express-handlebars');
var uniqid = require('uniqid');
app.engine('handlebars',exphbs({defaultLayout: 'main'}));
app.set('view engine', 'handlebars');
try{
var fs = require('fs');
//var privateKey = fs.readFileSync('/home/kasper/newssl_2016/nopass.key', 'utf8');
//var certificate = fs.readFileSync('/home/kasper/newssl_2016/zoff.no/ApacheServer/2_zoff.no.crt', 'utf8');
//var ca = fs.readFileSync('/home/kasper/newssl_2016/zoff.no/ApacheServer/1_root_bundle.crt');
var privateKey = fs.readFileSync('/etc/letsencrypt/live/zoff.me/privkey.pem').toString();
var certificate = fs.readFileSync('/etc/letsencrypt/live/zoff.me/cert.pem').toString();
var ca = fs.readFileSync('/etc/letsencrypt/live/zoff.me/chain.pem').toString();
//var ca_bundle = fs.readFileSync('/home/kasper/startssl/ca-bundle.pem')
//var credentials = {key: privateKey, cert: certificate, ca: ca,};
var credentials = {
key: privateKey,
cert: certificate,
@@ -24,7 +20,7 @@ try{
};
var https = require('https');
server = https.createServer(credentials, app);
server = https.Server(credentials, app);
var mongo_db_cred = require('./mongo_config.js');
var cors_proxy = require('cors-anywhere');
@@ -53,28 +49,23 @@ catch(err){
add = ",http://localhost:80*,http://localhost:8080*,localhost:8080*, localhost:8082*,,http://zoff.dev:80*,http://zoff.dev:8080*,zoff.dev:8080*, zoff.dev:8082*";
}
var bodyParser = require('body-parser')
var bodyParser = require('body-parser');
var cookieParser = require('cookie-parser')
app.use( bodyParser.json() ); // to support JSON-encoded bodies
app.use(bodyParser.urlencoded({ // to support URL-encoded bodies
extended: true
}));
app.use(cookieParser());
var io = require('socket.io')(server, {'pingTimeout': 25000});
var io = require('socket.io')(server, {'pingTimeout': 25000, "origins": ("https://zoff.me:443*,https://zoff.me:8080*,zoff.me:8080*,https://remote.zoff.me:443*,https://remote.zoff.me:8080*,https://fb.zoff.me:443*,https://fb.zoff.me:8080*,https://admin.zoff.me:443*,https://admin.zoff.me:8080*" + add)});
var request = require('request');
//db
var mongojs = require('mongojs');
var db = mongojs(mongo_db_cred.config);
//crypto
var crypto = require('crypto');
var node_cryptojs = require('node-cryptojs-aes');
var router = require('./router.js');
// node-cryptojs-aes main object;
var CryptoJS = node_cryptojs.CryptoJS;
var emojiStrip = require('emoji-strip');
var Filter = require('bad-words');
var filter = new Filter({ placeHolder: 'x'});
@@ -94,6 +85,14 @@ server.listen(port, function () {
});
app.use(function (req, res, next) {
var cookie = req.cookies._uI;
if (cookie === undefined) {
var user_name = rndName(uniqid.time(), 15);
res.cookie('_uI',user_name, { maxAge: 365 * 10000 * 3600000 });
}
next();
});
app.use('/', router);
app.use('/assets', express.static('views/assets'));
@@ -136,6 +135,12 @@ io.on('connection', function(socket){
else
name = names[guid];
socket.on("get_userlists", function(id) {
db.collection("frontpage_lists_" + id).find(function(err, docs) {
socket.emit("userlists", [docs]);
});
});
socket.on("get_spread", function(){
socket.emit("spread_listeners", {offline: offline_users.length, total: tot_view, online_users: lists});
});
@@ -287,7 +292,17 @@ io.on('connection', function(socket){
if(docs[x].pinned == 1) pinned = 1;
try{viewers = lists[docs[x]._id].length;}
catch(error){viewers = 0;}
var to_push = {viewers: viewers, id: docs[x].id, title: docs[x].title, channel: docs[x]._id, count: docs[x].count, pinned: pinned, accessed: docs[x].accessed != undefined ? docs[x].accessed : 0, thumbnail: docs[x].thumbnail != undefined ? docs[x].thumbnail : "", description: docs[x].description != undefined ? docs[x].description : ""};
var to_push = {
viewers: viewers,
id: docs[x].id,
title: docs[x].title,
channel: docs[x]._id,
count: docs[x].count,
pinned: pinned,
accessed: docs[x].accessed != undefined ? docs[x].accessed : 0,
thumbnail: docs[x].thumbnail != undefined ? docs[x].thumbnail : "",
description: docs[x].description != undefined ? docs[x].description : ""
};
if(pinned == 1 && docs[x].count > 0) playlists_to_send.unshift(to_push);
else if(docs[x].count > 0) playlists_to_send.push(to_push);
}
@@ -762,6 +777,11 @@ io.on('connection', function(socket){
left_channel(coll, guid, name, short_id, in_list, socket, false);
});
socket.on('disconnected', function()
{
left_channel(coll, guid, name, short_id, in_list, socket, false);
});
socket.on('reconnect_failed', function()
{
left_channel(coll, guid, name, short_id, in_list, socket, false);

4
server/views/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
server/views/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/views/assets/dist/remote.min.js vendored
View File

@@ -1 +1 @@
!function(){var t=!0;mobilecheck=function(){var t=!1;return function(e){(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(e)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(e.substr(0,4)))&&(t=!0)}(navigator.userAgent||navigator.vendor||window.opera),t},$(document).ready(function(){document.title="Zoff Remote",setTimeout(function(){$("#search").focus()},500);var t={"sync disconnect on unload":!0,secure:!0};$("#about").modal(),$("#contact").modal(),"remote.zoff.me"==window.location.hostname?add="https://zoff.me":add="localhost",socket=io.connect(add+":8080",t),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),e.control());try{git_info=$.ajax({type:"GET",url:"https://api.github.com/users/zoff-music/received_events",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].created_at.substring(0,10)+": "+git_info[0].actor.display_login+"<br><a href='https://github.com/"+git_info[0].repo.name+"/commit/"+git_info[0].payload.commits[0].sha+"' target='_blank'>"+git_info[0].payload.commits[0].sha.substring(0,10)+"</a>: "+git_info[0].payload.commits[0].message+"<br")}catch(t){}}),$("#playbutton").on("click",function(){socket.emit("id",{id:id,type:"play",value:"mock"})}),$("#pausebutton").on("click",function(){socket.emit("id",{id:id,type:"pause",value:"mock"})}),$("#skipbutton").on("click",function(){socket.emit("id",{id:id,type:"skip",value:"mock"})}),$(document).on("submit","#remoteform",function(t){console.log("testing"),t.preventDefault(),e.control()});var e={control:function(){t?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/"+id)),document.getElementById("remoteform").chan.value="",t=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(t,e){socket.emit("id",{id:id,type:"volume",value:e.value})}})):(socket.emit("id",{id:id,type:"channel",value:$("#search").val().toLowerCase()}),$("#search").val(""))}}}();
!function(){var e=!0;mobilecheck=function(){var e=!1;return function(t){(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(t)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(t.substr(0,4)))&&(e=!0)}(navigator.userAgent||navigator.vendor||window.opera),e},$(document).ready(function(){document.title="Zoff Remote",setTimeout(function(){$("#search").focus()},500);var e={"sync disconnect on unload":!0,secure:!0};$("#about").modal(),$("#contact").modal(),"remote.zoff.me"==window.location.hostname?add="https://zoff.me":add="localhost",socket=io.connect(add+":8080",e),id=window.location.pathname.split("/")[1],id&&(id=id.toLowerCase(),t.control());try{git_info=$.ajax({type:"GET",url:"https://api.github.com/users/zoff-music/received_events",async:!1}).responseText,git_info=$.parseJSON(git_info),$("#latest-commit").html("Latest Commit: <br>"+git_info[0].created_at.substring(0,10)+": "+git_info[0].actor.display_login+"<br><a href='https://github.com/"+git_info[0].repo.name+"/commit/"+git_info[0].payload.commits[0].sha+"' target='_blank'>"+git_info[0].payload.commits[0].sha.substring(0,10)+"</a>: "+git_info[0].payload.commits[0].message+"<br")}catch(e){}}),$("#playbutton").on("click",function(){socket.emit("id",{id:id,type:"play",value:"mock"})}),$("#pausebutton").on("click",function(){socket.emit("id",{id:id,type:"pause",value:"mock"})}),$("#skipbutton").on("click",function(){socket.emit("id",{id:id,type:"skip",value:"mock"})}),$(document).on("submit","#remoteform",function(e){console.log("testing"),e.preventDefault(),t.control()});var t={control:function(){e?(id||(id=document.getElementById("remoteform").chan.value,window.history.pushState("object or string","Title","/"+id)),document.getElementById("remoteform").chan.value="",e=!1,$(".rc").css("display","block"),$("#remote-text").text("Controlling "+id.toUpperCase()),document.getElementById("search").setAttribute("length","18"),document.getElementById("search").setAttribute("maxlength","18"),$("#forsearch").html("Type new channel name to change to"),$("#volume-control").slider({min:0,max:100,value:100,range:"min",animate:!0,stop:function(e,t){socket.emit("id",{id:id,type:"volume",value:t.value})}})):(socket.emit("id",{id:id,type:"channel",value:$("#search").val().toLowerCase()}),$("#search").val(""))}}}();

2
server/views/assets/js/crypt.js
View File

@@ -25,9 +25,7 @@ var Crypt = {
Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase());
}
console.log("test");
Hostcontroller.change_enabled(conf_arr.remote);
console.log("test 2");
if(conf_arr.width != 100) Player.set_width(conf_arr.width);
if(conf_arr.name !== undefined && conf_arr.name !== "") Chat.namechange(conf_arr.name);
}

1
server/views/assets/js/embed.js
View File

@@ -11,6 +11,7 @@ var adminpass = "";
var mobile_beginning = false;
var durationBegun = false;
var chromecastAvailable = false;
var private_channel = false;
var offline = false;
var from_frontpage = false;
var seekTo;

2
server/views/assets/js/frontpage.js
View File

@@ -269,6 +269,7 @@ var Frontpage = {
Frontpage.times_rotated = 0;
i = 0;
socket.emit("frontpage_lists");
socket.emit('get_userlists', Crypt.getCookie('_uI'));
}else if(frontpage){
Frontpage.times_rotated += 1;
Frontpage.add_backdrop(list, i+1);
@@ -452,6 +453,7 @@ function initfp(){
});
}
socket.emit('frontpage_lists');
socket.emit('get_userlists', Crypt.getCookie('_uI'));
$("#channel-load").css("display", "none");
//Materialize.toast("<a href='/remote' style='color:white;'>Try out our new feature, remote!</a>", 8000)

4
server/views/assets/js/hostcontroller.js
View File

@@ -40,7 +40,9 @@ var Hostcontroller = {
$("#chan").html(Helper.upperFirst(chan));
w_p = true;
socket.emit("list", chan.toLowerCase());
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", add + chan.toLowerCase());
/*if(Crypt.get_pass(chan.toLowerCase()) !== undefined && Crypt.get_pass(chan.toLowerCase()) != ""){
socket.emit("password", {password: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase())), channel: chan.toLowerCase()});

28
server/views/assets/js/listeners.js
View File

@@ -8,6 +8,7 @@ var api_key = "***REMOVED***";
var searching = false;
var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/;
var conf = [];
var private_channel = false;
var music = 0;
var frontpage = 1;
var adminpass = "";
@@ -148,9 +149,11 @@ $().ready(function(){
function init(){
number_suggested = 0;
var no_socket = true;
var pathname = window.location.pathname.split("/");
if(pathname.length == 3) {
private_channel = true;
}
chan = $("#chan").html();
console.log(chan);
mobile_beginning = Helper.mobilecheck();
var side = Helper.mobilecheck() ? "left" : "right";
@@ -236,7 +239,11 @@ function init(){
$("#code-link").attr("href", codeURL);
}
if(no_socket) socket.emit('list', chan.toLowerCase());
if(no_socket){
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", add + chan.toLowerCase());
}
$("#viewers").tooltip({
delay: 5,
position: "top",
@@ -494,7 +501,9 @@ function setup_youtube_listener(){
function get_list_listener(){
socket.on("get_list", function(){
socket.emit('list', chan.toLowerCase());
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", add + chan.toLowerCase());
});
}
@@ -687,8 +696,10 @@ function change_offline(enabled, already_offline){
$("#seekToDuration").remove();
if(window.location.pathname != "/"){
socket.emit("pos");
socket.emit('list', chan.toLowerCase());
if($("#controls").hasClass("ewresize")) $("#controls").removeClass("ewresize");
var add = "";
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", add + chan.toLowerCase());
if($("#controls").hasClass("ewresize")) $("#controls").removeClass("ewresize");
}
}
}
@@ -1576,9 +1587,10 @@ function onepage_load(){
chan = url_split[3].replace("#", "");
$("#chan").html(Helper.upperFirst(chan));
var add = "";
w_p = true;
socket.emit("list", chan.toLowerCase());
if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", add + chan.toLowerCase());
}else if(url_split[3] === ""){
clearTimeout(width_timeout);
if(fireplace_initiated){

2
server/views/assets/js/remotecontroller.js
View File

@@ -19,7 +19,7 @@ $(document).ready(function (){
if(window.location.hostname == "remote.zoff.me") add = "https://zoff.me";
else add = "localhost";
socket = io.connect(add + ':8080', connection_options);
socket = io.connect(add+':8080', connection_options);
id = window.location.pathname.split("/")[1];
if(id)
{