KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying fix for vote/add on mobile-client

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-23 18:18:24 +01:00
parent a02cdbcf88
commit c03d85b83f
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/handlers/list_change.js
View File

@@ -192,6 +192,7 @@ function addPlaylist(arr, guid, offline, socket) {
if(!this_element.hasOwnProperty("end")) this_element.end = this_element.duration; if(!this_element.hasOwnProperty("end")) this_element.end = this_element.duration;
this_element.start = parseInt(this_element.start); this_element.start = parseInt(this_element.start);
this_element.end = parseInt(this_element.end); this_element.end = parseInt(this_element.end);
this_element.type = "video";
this_element.duration = parseInt(this_element.duration); this_element.duration = parseInt(this_element.duration);
if(this_element.start > this_element.end) { if(this_element.start > this_element.end) {
this_element.start = 0; this_element.start = 0;

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

@@ -31,6 +31,7 @@ var player_ready = false;
var viewers = 1; var viewers = 1;
var temp_user_pass = ""; var temp_user_pass = "";
var zoff_api_token = "DwpnKVkaMH2HdcpJT2YPy783SY33byF5/32rbs0+xdU="; var zoff_api_token = "DwpnKVkaMH2HdcpJT2YPy783SY33byF5/32rbs0+xdU=";
//var zoff_api_token = "AhmC4Yg2BhaWPZBXeoWK96DAiAVfbou8TUG2IXtD3ZQ=";
var retry_frontpage; var retry_frontpage;
var chromecast_specs_sent = false; var chromecast_specs_sent = false;
var dragging = false; var dragging = false;

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

@@ -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-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
res.header({"Content-Type": "application/json"}); res.header({"Content-Type": "application/json"});
console.log("here");
try { try {
if(!req.body.hasOwnProperty('adminpass') || !req.body.hasOwnProperty('userpass') || if(!req.body.hasOwnProperty('adminpass') || !req.body.hasOwnProperty('userpass') ||
!req.params.hasOwnProperty('channel_name') || !req.params.hasOwnProperty('video_id')) { !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)); res.status(404).send(JSON.stringify(error.not_found.list));
return; return;
} }
db.collection(channel_name).find({id: video_id, now_playing: false, type:"video"}, function(err, song) { db.collection(channel_name).find({id: video_id, now_playing: false}, function(err, song) {
if(song.length == 0) { if(song.length == 0 || (song.hasOwnProperty("type") && song.type == "suggested")) {
res.status(404).send(JSON.stringify(error.not_found.local)); res.status(404).send(JSON.stringify(error.not_found.local));
return; return;
} else if(song[0].guids.indexOf(guid) > -1) { } else if(song[0].guids.indexOf(guid) > -1) {