From f3f9e48956baf82583a8138246db1429697dae83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sat, 2 May 2015 11:36:12 +0200 Subject: [PATCH 1/7] Trying out not skipping for the first 20 seconds of the video --- server/server.js | 7 +++++-- static/js/admin.js | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/server.js b/server/server.js index 93f4e775..e26ecab6 100755 --- a/server/server.js +++ b/server/server.js @@ -304,11 +304,14 @@ io.on('connection', function(socket){ db.collection(coll).find({skip: false}, function(err, docs){ if(docs.length == 1) { - if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid)) + if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 20) { change_song(coll); socket.emit("toast", "skip"); - }else if(!contains(docs[0]["skips"], guid)){ + }else if(get_time() - docs[0]["startTime"] < 20) + { + socket.emit("toast", "notyetskip"); + }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){ db.collection(coll).update({views:{$exists:true}}, {$push:{skips:guid}}, function(err, d){ socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!"); }); diff --git a/static/js/admin.js b/static/js/admin.js index 0d0aa6a4..ed16d989 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -39,6 +39,9 @@ socket.on("toast", function(msg) case "alreadyskip": msg=rnd(["Skipping is democratic, only one vote per person!", "More people have to vote to skip, not just you!", "Get someone else to skip too! You can't do it on yourself."]) break; + case "notyetskip": + msg="Skipping is disabled the first 30 seconds of the video."; + break; } Materialize.toast(msg, 4000); }); From 617662c455d76dc243e9cda389c0bd35be29712a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 01:45:25 +0200 Subject: [PATCH 2/7] 10 seconds instead of 20 --- server/server.js | 4 ++-- static/js/admin.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index e26ecab6..31bf53c8 100755 --- a/server/server.js +++ b/server/server.js @@ -304,11 +304,11 @@ io.on('connection', function(socket){ db.collection(coll).find({skip: false}, function(err, docs){ if(docs.length == 1) { - if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 20) + if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 10) { change_song(coll); socket.emit("toast", "skip"); - }else if(get_time() - docs[0]["startTime"] < 20) + }else if(get_time() - docs[0]["startTime"] < 10) { socket.emit("toast", "notyetskip"); }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){ diff --git a/static/js/admin.js b/static/js/admin.js index ed16d989..28e4cbc0 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -40,7 +40,7 @@ socket.on("toast", function(msg) msg=rnd(["Skipping is democratic, only one vote per person!", "More people have to vote to skip, not just you!", "Get someone else to skip too! You can't do it on yourself."]) break; case "notyetskip": - msg="Skipping is disabled the first 30 seconds of the video."; + msg="Skipping is disabled the first 10 seconds of the video."; break; } Materialize.toast(msg, 4000); From 8b0bad0b937e61af679a6280406007572881e35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 11:41:20 +0200 Subject: [PATCH 3/7] Fixed client reconnect on server crash --- php/footer.php | 5 ++++- server/server.js | 7 +++++-- static/js/list.js | 4 ---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/php/footer.php b/php/footer.php index 3eeadde0..103ff220 100755 --- a/php/footer.php +++ b/php/footer.php @@ -59,7 +59,10 @@ diff --git a/server/server.js b/server/server.js index 31bf53c8..605cf09e 100755 --- a/server/server.js +++ b/server/server.js @@ -21,8 +21,10 @@ server.listen(port, function () { io.on('connection', function(socket){ - socket.on('echo', function(data, callback) { - callback(data); + socket.emit("get_list"); + + socket.on('ping', function() { + socket.emit("ok"); }); var coll; @@ -76,6 +78,7 @@ io.on('connection', function(socket){ socket.on('list', function(list) { + console.log("list"); in_list = true; list = list.split(','); coll = list[0].toLowerCase(); diff --git a/static/js/list.js b/static/js/list.js index 6ceff977..ccc4f32d 100755 --- a/static/js/list.js +++ b/static/js/list.js @@ -15,10 +15,6 @@ var check = false; (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true;})(navigator.userAgent||navigator.vendor||window.opera); return check; }; -socket.on("abc", function(){ - alert("alert"); -}); - socket.on(chan.toLowerCase(), function(msg){ populate_list(msg, false); }); From c87e6ad7a72f0a9ce0e4c92977e630e21fec8cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 11:52:07 +0200 Subject: [PATCH 4/7] Server is on dev folder, forever script must be fixed. Temporary fix for it --- scripts/getnew.sh | 4 ++++ server/server.js | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/getnew.sh b/scripts/getnew.sh index aba56bc2..d6063ec4 100755 --- a/scripts/getnew.sh +++ b/scripts/getnew.sh @@ -3,4 +3,8 @@ cd /var/www git stash git pull scripts/./setperms.sh +cd /var/dev +git stash +git pull +scripts/./setperms.sh forever restartall diff --git a/server/server.js b/server/server.js index 605cf09e..ff583348 100755 --- a/server/server.js +++ b/server/server.js @@ -78,7 +78,6 @@ io.on('connection', function(socket){ socket.on('list', function(list) { - console.log("list"); in_list = true; list = list.split(','); coll = list[0].toLowerCase(); From 15ed3884df6495d03d593f4173fb028a7f5b4625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 12:01:49 +0200 Subject: [PATCH 5/7] fixed serverside bug --- scripts/getnew.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/getnew.sh b/scripts/getnew.sh index d6063ec4..aba56bc2 100755 --- a/scripts/getnew.sh +++ b/scripts/getnew.sh @@ -3,8 +3,4 @@ cd /var/www git stash git pull scripts/./setperms.sh -cd /var/dev -git stash -git pull -scripts/./setperms.sh forever restartall From 464b9bd189eb052bbf8a4d7ec000a468d9813084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 13:26:30 +0200 Subject: [PATCH 6/7] Fixed so you can't skip the first 10 seconds of a video if there is only two viewers on the channel --- server/server.js | 5 +++-- static/js/admin.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/server.js b/server/server.js index ff583348..ef5afd61 100755 --- a/server/server.js +++ b/server/server.js @@ -306,11 +306,12 @@ io.on('connection', function(socket){ db.collection(coll).find({skip: false}, function(err, docs){ if(docs.length == 1) { - if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 10) + if(lists[coll].length/2 <= docs[0]["skips"].length+1 && !contains(docs[0]["skips"], guid) && (get_time() - docs[0]["startTime"] >= 10 + || lists[coll].length != 2)) { change_song(coll); socket.emit("toast", "skip"); - }else if(get_time() - docs[0]["startTime"] < 10) + }else if(get_time() - docs[0]["startTime"] < 10 && lists[coll].length == 2) { socket.emit("toast", "notyetskip"); }else if(!contains(docs[0]["skips"], guid) && get_time() - docs[0]["startTime"] >= 30){ diff --git a/static/js/admin.js b/static/js/admin.js index 28e4cbc0..3800c548 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -40,7 +40,7 @@ socket.on("toast", function(msg) msg=rnd(["Skipping is democratic, only one vote per person!", "More people have to vote to skip, not just you!", "Get someone else to skip too! You can't do it on yourself."]) break; case "notyetskip": - msg="Skipping is disabled the first 10 seconds of the video."; + msg="Skipping is disabled the first 10 seconds."; break; } Materialize.toast(msg, 4000); From b771cb03f2e4fad1bb6ed4f6d152c9a938ed82db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Sun, 3 May 2015 17:40:17 +0200 Subject: [PATCH 7/7] More logging --- server/server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/server.js b/server/server.js index ef5afd61..df2c3165 100755 --- a/server/server.js +++ b/server/server.js @@ -83,6 +83,8 @@ io.on('connection', function(socket){ coll = list[0].toLowerCase(); guid = list[1]; + console.log(guid + " joined list " + coll); + if(lists[coll] == undefined) { lists[coll] = []; @@ -430,6 +432,7 @@ io.on('connection', function(socket){ { try { + console.log(guid + " left list " + coll); var index = lists[coll].indexOf(guid); lists[coll].splice(index, 1); io.sockets.emit(coll+",viewers", lists[coll].length);