Returned to refactored state

This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-18 14:47:24 +02:00
parent 52c7552b67
commit 77c374f9b7
11 changed files with 534 additions and 2299 deletions

View File

@@ -9,13 +9,13 @@ function add_function(arr, coll, guid, offline, socket) {
}
db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (arr.hasOwnProperty('pass') && docs[0].userpass == decrypt_string(socketid, arr.pass)))) {
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (arr.hasOwnProperty('pass') && docs[0].userpass == Functions.decrypt_string(socketid, arr.pass)))) {
check_inlist(coll, guid, socket, offline);
Functions.check_inlist(coll, guid, socket, offline);
var id = arr.id;
var title = arr.title;
var hash = hash_pass(decrypt_string(socketid, arr.adminpass));
var hash = Functions.hash_pass(Functions.decrypt_string(socketid, arr.adminpass));
var duration = parseInt(arr.duration);
var full_list = arr.playlist;
var last = arr.num == arr.total - 1;
@@ -34,7 +34,7 @@ function add_function(arr, coll, guid, offline, socket) {
var votes;
var added;
if(full_list) {
var time = get_time()-total;
var time = Functions.get_time()-total;
time = time.toString();
var total_len = total.toString().length;
var now_len = num.toString().length;
@@ -49,7 +49,7 @@ function add_function(arr, coll, guid, offline, socket) {
added = time;
votes = 0;
} else {
added = get_time();
added = Functions.get_time();
votes = 1;
}
@@ -81,15 +81,15 @@ function add_function(arr, coll, guid, offline, socket) {
db.collection(coll).update({id: id}, {"added": added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}, {upsert: true}, function(err, docs){
if(np)
{
send_list(coll, undefined, false, true, false);
db.collection(coll).update({views:{$exists:true}}, {$set:{startTime: get_time()}});
send_play(coll, undefined);
update_frontpage(coll, id, title);
List.send_list(coll, undefined, false, true, false);
db.collection(coll).update({views:{$exists:true}}, {$set:{startTime: Functions.get_time()}});
List.send_play(coll, undefined);
Frontpage.update_frontpage(coll, id, title);
} else {
io.to(coll).emit("channel", {type: "added", value: {"_id": "asd", "added":added,"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}});
}
db.collection("frontpage_lists").update({_id:coll}, {$inc:{count:1}, $set:{accessed: get_time()}}, {upsert:true}, function(err, docs){});
getNextSong(coll);
db.collection("frontpage_lists").update({_id:coll}, {$inc:{count:1}, $set:{accessed: Functions.get_time()}}, {upsert:true}, function(err, docs){});
List.getNextSong(coll);
});
if(!full_list) {
socket.emit("toast", "addedsong");
@@ -98,7 +98,7 @@ function add_function(arr, coll, guid, offline, socket) {
}
});
} else if(!full_list) {
vote(coll, id, guid, socket, full_list, last);
ListChange.vote(coll, id, guid, socket, full_list, last);
if(full_list && last) {
socket.emit("toast", "addedplaylist");
}
@@ -110,7 +110,7 @@ function add_function(arr, coll, guid, offline, socket) {
db.collection(coll).find({id: id}, function(err, docs) {
if(docs.length === 0) {
db.collection(coll).update({id: id}, {$set:{
"added":get_time(),
"added":Functions.get_time(),
"guids": [guid],
"id":id,
"now_playing": false,
@@ -126,7 +126,7 @@ function add_function(arr, coll, guid, offline, socket) {
} else if(docs[0].now_playing === true){
socket.emit("toast", "alreadyplay");
} else{
if(conf[0].vote === false) vote(coll, id, guid, socket, full_list, last);
if(conf[0].vote === false) ListChange.vote(coll, id, guid, socket, full_list, last);
else socket.emit("toast", "listhaspass");
}
});
@@ -155,21 +155,21 @@ function voteUndecided(msg, coll, guid, offline, socket) {
}
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 == Functions.decrypt_string(socketid, msg.pass)))) {
check_inlist(coll, guid, socket, offline);
Functions.check_inlist(coll, guid, socket, offline);
if(msg.type == "del")
del(msg, socket, socketid);
ListChange.del(msg, socket, socketid);
else
{
var id = msg.id;
var hash = hash_pass(decrypt_string(socketid, msg.adminpass));
var hash = Functions.hash_pass(Functions.decrypt_string(socketid, msg.adminpass));
db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs !== null && docs.length !== 0 && ((docs[0].vote === true && (hash == docs[0].adminpass || docs[0].adminpass === "")) ||
docs[0].vote === false))
{
vote(coll, id, guid, socket, false, false);
ListChange.vote(coll, id, guid, socket, false, false);
}else{
socket.emit("toast", "listhaspass");
}
@@ -193,17 +193,17 @@ function shuffle(msg, coll, guid, offline, socket) {
return;
}
check_inlist(coll, guid, socket, offline);
Functions.check_inlist(coll, guid, socket, offline);
var hash;
if(msg.adminpass === "") hash = msg.adminpass;
else hash = hash_pass(decrypt_string(socketid, msg.adminpass));
else hash = Functions.hash_pass(Functions.decrypt_string(socketid, msg.adminpass));
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 == Functions.decrypt_string(socketid, msg.pass)))) {
if(docs !== null && docs.length !== 0 && ((docs[0].adminpass == hash || docs[0].adminpass === "") || docs[0].shuffle === false))
{
db.collection(coll).find({now_playing:false}).forEach(function(err, docs){
if(!docs){
send_list(coll, undefined, false, true, false, true);
List.send_list(coll, undefined, false, true, false, true);
socket.emit("toast", "shuffled");
return;
@@ -222,8 +222,8 @@ function shuffle(msg, coll, guid, offline, socket) {
var complete = function(tot, curr){
if(tot == curr)
{
send_list(coll, undefined, false, true, false);
getNextSong(coll);
List.send_list(coll, undefined, false, true, false);
List.getNextSong(coll);
}
};
@@ -238,7 +238,7 @@ function del(params, socket, socketid) {
coll = encodeURIComponent(coll).replace(/\W/g, '');
coll = filter.clean(coll);
db.collection(coll).find({views:{$exists:true}}, function(err, docs){
if(docs !== null && docs.length !== 0 && docs[0].adminpass == hash_pass(decrypt_string(socketid, params.adminpass)))
if(docs !== null && docs.length !== 0 && docs[0].adminpass == Functions.hash_pass(Functions.decrypt_string(socketid, params.adminpass)))
{
db.collection(coll).find({id:params.id}, function(err, docs){
dont_increment = true;
@@ -249,7 +249,7 @@ function del(params, socket, socketid) {
db.collection(coll).remove({id:params.id}, function(err, docs){
socket.emit("toast", "deletesong");
io.to(coll).emit("channel", {type:"deleted", value: params.id});
if(dont_increment) db.collection("frontpage_lists").update({_id: coll}, {$inc: {count: -1}, $set:{accessed: get_time()}}, {upsert: true}, function(err, docs){});
if(dont_increment) db.collection("frontpage_lists").update({_id: coll}, {$inc: {count: -1}, $set:{accessed: Functions.get_time()}}, {upsert: true}, function(err, docs){});
});
}
});
@@ -262,16 +262,16 @@ function del(params, socket, socketid) {
function delete_all(msg, coll, guid, offline, socket) {
var socketid = socket.zoff_id;
if(typeof(msg) == 'object' && msg.hasOwnProperty('channel') && msg.hasOwnProperty('adminpass') && msg.hasOwnProperty('pass')) {
var hash = hash_pass(decrypt_string(socketid, msg.adminpass));
var hash_userpass = decrypt_string(socketid, msg.pass);
var hash = Functions.hash_pass(Functions.decrypt_string(socketid, msg.adminpass));
var hash_userpass = Functions.decrypt_string(socketid, msg.pass);
db.collection(coll).find({views: {$exists: true}}, function(err, conf) {
if(conf.length == 1 && conf) {
conf = conf[0];
if(conf.adminpass == hash && conf.adminpass != "" && (conf.userpass == "" || conf.userpass == undefined || (conf.userpass != "" && conf.userpass != undefined && conf.pass == hash_userpass))) {
db.collection(coll).remove({views: {$exists: false}}, {multi: true}, function(err, succ) {
send_list(coll, false, true, true, true);
db.collection("frontpage_lists").update({_id: coll}, {$set: {count: 0, accessed: get_time()}}, {upsert: true}, function(err, docs) {});
List.send_list(coll, false, true, true, true);
db.collection("frontpage_lists").update({_id: coll}, {$set: {count: 0, accessed: Functions.get_time()}}, {upsert: true}, function(err, docs) {});
socket.emit("toast", "deleted_songs");
});
} else {
@@ -287,15 +287,15 @@ function delete_all(msg, coll, guid, offline, socket) {
function vote(coll, id, guid, socket, full_list, last) {
db.collection(coll).find({id:id, now_playing: false}, function(err, docs){
if(docs !== null && docs.length > 0 && !contains(docs[0].guids, guid))
if(docs !== null && docs.length > 0 && !Functions.contains(docs[0].guids, guid))
{
db.collection(coll).update({id:id}, {$inc:{votes:1}, $set:{added:get_time()}, $push :{guids: guid}}, function(err, docs)
db.collection(coll).update({id:id}, {$inc:{votes:1}, $set:{added:Functions.get_time()}, $push :{guids: guid}}, function(err, docs)
{
if((full_list && last) || (!full_list))
socket.emit("toast", "voted");
io.to(coll).emit("channel", {type: "vote", value: id, time: get_time()});
io.to(coll).emit("channel", {type: "vote", value: id, time: Functions.get_time()});
getNextSong(coll);
List.getNextSong(coll);
});
}else
{
@@ -303,3 +303,10 @@ function vote(coll, id, guid, socket, full_list, last) {
}
});
}
module.exports.add_function = add_function;
module.exports.voteUndecided = voteUndecided;
module.exports.shuffle = shuffle;
module.exports.del = del;
module.exports.delete_all = delete_all;
module.exports.vote = vote;