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

Fixed critical crash issue with shuffling

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-05-05 23:30:37 +02:00
parent 1a2513920b
commit 92ba3f1a82
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/js/list.js
View File

@@ -478,7 +478,7 @@ var List = {
skip: function(){ skip: function(){
if(!offline){ if(!offline){
socket.emit('skip', {pass: adminpass, id:video_id, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit('skip', {pass: adminpass, id:video_id, channel: chan.toLowerCase(), userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} else { } else {
Player.playNext(); Player.playNext();
} }

2
server/public/assets/js/listeners.js
View File

@@ -481,7 +481,7 @@ function chromecastListener(evt, data){
if(offline){ if(offline){
Player.playNext(); Player.playNext();
} else { } else {
socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass, channel: chan.toLowerCase, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("skip", {error: json_parsed.data_code, id: json_parsed.videoId, pass: adminpass, channel: chan.toLowerCase, userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
} }
break; break;
} }

2
server/public/assets/js/player.js
View File

@@ -320,7 +320,7 @@ var Player = {
curr_playing = Player.player.getVideoUrl().replace("https://www.youtube.com/watch?v=", ""); curr_playing = Player.player.getVideoUrl().replace("https://www.youtube.com/watch?v=", "");
socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); socket.emit("skip", {error: newState.data, id: video_id, pass: adminpass, channel: chan.toLowerCase, userpass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});
//Helper.log(video_id, Player.player.getVideoUrl(), Player.player.getPlayerState()); //Helper.log(video_id, Player.player.getVideoUrl(), Player.player.getPlayerState());
/*}else{ /*}else{

1
server/public/layouts/frontpage.handlebars
View File

@@ -30,6 +30,7 @@
<br> <br>
Do not redistribute without permission from the developers. Do not redistribute without permission from the developers.
<br> <br>
</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a> <a href="#" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>

6
server/server.js
View File

@@ -746,7 +746,7 @@ io.on('connection', function(socket){
} }
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (list.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, list.pass)))) { if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (list.hasOwnProperty('userpass') && docs[0].userpass == decrypt_string(socketid, list.userpass)))) {
check_inlist(coll, guid, socket, name, offline); check_inlist(coll, guid, socket, name, offline);
@@ -921,8 +921,8 @@ io.on('connection', function(socket){
check_inlist(coll, guid, socket, name, offline); check_inlist(coll, guid, socket, name, offline);
var hash; var hash;
if(pass === "") hash = pass; if(msg.adminpass === "") hash = msg.adminpass;
else hash = hash_pass(decrypt_string(socketid, pass)); else hash = hash_pass(decrypt_string(socketid, msg.adminpass));
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (msg.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, msg.pass)))) { if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (msg.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, msg.pass)))) {
if(docs !== null && docs.length !== 0 && ((docs[0].adminpass == hash || docs[0].adminpass === "") || docs[0].shuffle === false)) if(docs !== null && docs.length !== 0 && ((docs[0].adminpass == hash || docs[0].adminpass === "") || docs[0].shuffle === false))