From c03d85b83f06c988b5b1123b1797e0841204c196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 23 Mar 2018 18:18:24 +0100 Subject: [PATCH] Trying fix for vote/add on mobile-client --- server/handlers/list_change.js | 1 + server/public/assets/js/listeners.js | 1 + server/routing/client/api.js | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js index 254d239d..b0b8dcbd 100644 --- a/server/handlers/list_change.js +++ b/server/handlers/list_change.js @@ -192,6 +192,7 @@ function addPlaylist(arr, guid, offline, socket) { if(!this_element.hasOwnProperty("end")) this_element.end = this_element.duration; this_element.start = parseInt(this_element.start); this_element.end = parseInt(this_element.end); + this_element.type = "video"; this_element.duration = parseInt(this_element.duration); if(this_element.start > this_element.end) { this_element.start = 0; diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js index c46c7395..ced6a3e4 100755 --- a/server/public/assets/js/listeners.js +++ b/server/public/assets/js/listeners.js @@ -31,6 +31,7 @@ var player_ready = false; var viewers = 1; var temp_user_pass = ""; var zoff_api_token = "DwpnKVkaMH2HdcpJT2YPy783SY33byF5/32rbs0+xdU="; +//var zoff_api_token = "AhmC4Yg2BhaWPZBXeoWK96DAiAVfbou8TUG2IXtD3ZQ="; var retry_frontpage; var chromecast_specs_sent = false; var dragging = false; diff --git a/server/routing/client/api.js b/server/routing/client/api.js index 136872d4..f4ec6ffe 100644 --- a/server/routing/client/api.js +++ b/server/routing/client/api.js @@ -421,7 +421,7 @@ router.route('/api/list/:channel_name/:video_id').put(function(req,res) { res.header("Access-Control-Allow-Origin", "*"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header({"Content-Type": "application/json"}); - + console.log("here"); try { if(!req.body.hasOwnProperty('adminpass') || !req.body.hasOwnProperty('userpass') || !req.params.hasOwnProperty('channel_name') || !req.params.hasOwnProperty('video_id')) { @@ -487,8 +487,8 @@ router.route('/api/list/:channel_name/:video_id').put(function(req,res) { res.status(404).send(JSON.stringify(error.not_found.list)); return; } - db.collection(channel_name).find({id: video_id, now_playing: false, type:"video"}, function(err, song) { - if(song.length == 0) { + db.collection(channel_name).find({id: video_id, now_playing: false}, function(err, song) { + if(song.length == 0 || (song.hasOwnProperty("type") && song.type == "suggested")) { res.status(404).send(JSON.stringify(error.not_found.local)); return; } else if(song[0].guids.indexOf(guid) > -1) {