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

Correct error-message on song-get on protected list

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-02 11:40:39 +01:00
parent 1e00cbb9e7
commit 5e9e682932
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/routing/client/api.js
View File

@@ -209,7 +209,6 @@ router.route('/api/conf/:channel_name').put(function(req, res) {
typeof(allvideos) != "boolean" || typeof(removeplay) != "boolean" ||
typeof(skipping) != "boolean" || typeof(shuffling) != "boolean" ||
typeof(userpass_changed) != "boolean") {
console.log("crash here");
throw "Wrong format";
}
} catch(e) {
@@ -532,24 +531,23 @@ router.route('/api/list/:channel_name/:video_id').get(function(req, res) {
searchQuery = {now_playing: true};
}
db.collection(channel_name).find(searchQuery, toShowChannel, function(err, docs) {
if(docs.length > 0) {
db.collection(channel_name + "_settings").find({views: {$exists: true}}, function(err, conf) {
if(conf.length == 0) {
res.status(404).send(JSON.stringify(error.not_found.list));
return;
} else if(conf[0].userpass != "" && conf[0].userpass != undefined) {
res.status(404).send(JSON.stringify(error.not_authenticated));
return;
}
var to_return = error.no_error;
to_return.results = docs;
res.status(200).send(JSON.stringify(to_return));
db.collection(channel_name + "_settings").find({views: {$exists: true}}, function(err, conf) {
if(conf.length == 0) {
res.status(404).send(JSON.stringify(error.not_found.list));
return;
});
} else {
res.status(404).send(JSON.stringify(error.not_found.local));
} else if(conf[0].userpass != "" && conf[0].userpass != undefined) {
res.status(404).send(JSON.stringify(error.not_authenticated));
return;
}
if(docs.length == 0) {
res.status(404).send(JSON.stringify(error.not_found.local));
return;
}
var to_return = error.no_error;
to_return.results = docs;
res.status(200).send(JSON.stringify(to_return));
return;
}
});
});
});