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

added parseint for duration

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-28 22:09:29 +02:00
parent 204c385d62
commit b2519516f6
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/server.js
View File

@@ -138,7 +138,7 @@ io.on('connection', function(socket){
}else }else
{ {
console.log(np[0]["title"] + " before if"); console.log(np[0]["title"] + " before if");
if(startTime+np[0]["duration"]<=get_time()+2) if(startTime+parseInt(np[0]["duration"])<=get_time()+2)
{ {
console.log(np[0]["title"] + " after if"); console.log(np[0]["title"] + " after if");
db.collection(coll).update({now_playing:true, id:id}, db.collection(coll).update({now_playing:true, id:id},
@@ -197,7 +197,7 @@ io.on('connection', function(socket){
var id = arr[0]; var id = arr[0];
var title = arr[1]; var title = arr[1];
var hash = hash_pass(arr[2]); var hash = hash_pass(arr[2]);
var duration = arr[3]; var duration = parseInt(arr[3]);
db.collection(coll).find({views:{$exists:true}}, function(err, docs) db.collection(coll).find({views:{$exists:true}}, function(err, docs)
{ {
if((docs[0]["addsongs"] == true && (hash == docs[0]["adminpass"] || docs[0]["adminpass"] == "")) || docs[0]["addsongs"] == false) if((docs[0]["addsongs"] == true && (hash == docs[0]["adminpass"] || docs[0]["adminpass"] == "")) || docs[0]["addsongs"] == false)
@@ -214,7 +214,6 @@ io.on('connection', function(socket){
np = false; np = false;
db.collection(coll).insert({"added":get_time(),"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}, function(err, docs){ db.collection(coll).insert({"added":get_time(),"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}, function(err, docs){
sort_list(coll, undefined, np, true); sort_list(coll, undefined, np, true);
socket.emit("toast", "addedsong");
}); });
}); });
}else{ }else{
@@ -437,7 +436,7 @@ io.on('connection', function(socket){
lists[coll].push(guid); lists[coll].push(guid);
io.sockets.emit(coll+",viewers", lists[coll].length); io.sockets.emit(coll+",viewers", lists[coll].length);
} }
send_play(coll, socket); send_play(coll, socket);
}); });
}); });