diff --git a/server/public/assets/dist/callback.min.js b/server/public/assets/dist/callback.min.js index 7ce5b9fe..855c078a 100755 --- a/server/public/assets/dist/callback.min.js +++ b/server/public/assets/dist/callback.min.js @@ -1 +1 @@ -!function(){function e(e){var t,a=e.substring(1).split("&"),n={};for(var i in a)t=a[i].split("="),2==t.length&&(n[t[0]]=t[1]);return n}window.addEventListener("load",function(){var t,a,n,i=e(window.location.hash),o=window.location.protocol+"//"+window.location.hostname+"/o_callback";if(i.spotify)t="b934ecdd173648f5bcd38738af529d58",a="token",n="playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public",state=i.nonce,window.location.href="https://accounts.spotify.com/authorize?client_id="+t+"&scope="+n+"&show_dialog=false&response_type="+a+"&redirect_uri="+o+"&state="+state;else if(i.youtube)t="944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com",a="token",n="https://www.googleapis.com/auth/youtube",state=i.nonce,window.location.href="https://accounts.google.com/o/oauth2/v2/auth?client_id="+t+"&response_type="+a+"&state="+state+"&redirect_uri="+o+"&scope="+n;else{var s=e(window.location.hash);window.opener.callback(s)}})}(); \ No newline at end of file +!function(){function e(e){var t,a=e.substring(1).split("&"),n={};for(var s in a)t=a[s].split("="),2==t.length&&(n[t[0]]=t[1]);return n}window.addEventListener("load",function(){var t,a,n,s=e(window.location.hash),i=window.location.protocol+"//"+window.location.hostname+"/o_callback";if(s.spotify)t="b934ecdd173648f5bcd38738af529d58",a="token",n="playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public",state=s.nonce,window.location.href="https://accounts.spotify.com/authorize?client_id="+t+"&scope="+n+"&show_dialog=false&response_type="+a+"&redirect_uri="+i+"&state="+state;else if(s.youtube)t="944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com",a="token",n="https://www.googleapis.com/auth/youtube",state=s.nonce,window.location.href="https://accounts.google.com/o/oauth2/v2/auth?client_id="+t+"&response_type="+a+"&state="+state+"&redirect_uri="+i+"&scope="+n;else{var o=e(window.location.hash);window.opener.callback(o)}})}(); \ No newline at end of file diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js index cfc45fdf..b399cdc4 100755 --- a/server/public/assets/js/admin.js +++ b/server/public/assets/js/admin.js @@ -105,7 +105,7 @@ var Admin = { Crypt.set_pass(chan.toLowerCase(), Crypt.decrypt_pass(msg)); for (var i = 0; i < names.length; i++) { - $("input[name="+names[i]+"]").attr("disabled", false); + $("input[name="+names[i]+"]").attr("disabled", false); } $(".card-action").removeClass("hide"); @@ -124,25 +124,21 @@ var Admin = { if($(".password_protected").prop("checked")) { $(".change_user_pass").removeClass("hide"); } - //if(!Helper.mobilecheck()){ if(!Helper.contains($(".playlist-tabs").attr("class").split(" "), "hide")) { $(".playlist-tabs-loggedIn").removeClass("hide"); $(".playlist-tabs").addClass("hide"); } - //$("#top-button").toggleClass("top-button-with-tabs"); - //$("#wrapper").toggleClass("tabs_height"); - //} if($("#admin-lock").html() != "lock_open"){ - $("#admin-lock").addClass("clickable"); - $("#admin-lock").html("lock_open"); - if(!Helper.mobilecheck()){ - $('#admin-lock').tooltip({ - delay: 5, - position: "left", - tooltip: "Logout" - }); - } + $("#admin-lock").addClass("clickable"); + $("#admin-lock").html("lock_open"); + if(!Helper.mobilecheck()){ + $('#admin-lock').tooltip({ + delay: 5, + position: "left", + tooltip: "Logout" + }); + } } $('ul.playlist-tabs-loggedIn').tabs('select_tab', $(".playlist-tabs li a.active").attr("href").substring(1)); }, @@ -163,41 +159,41 @@ var Admin = { { if(!w_p) { - socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase(), oldpass: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase()))}); + socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase(), oldpass: Crypt.crypt_pass(Crypt.get_pass(chan.toLowerCase()))}); } else { - socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()}); + socket.emit('password', {password: Crypt.crypt_pass(CryptoJS.SHA256(document.getElementById("password").value).toString()), channel: chan.toLowerCase()}); } }, log_out: function(){ before_toast(); - if(Crypt.get_pass(chan.toLowerCase())){ + if(Crypt.get_pass(chan.toLowerCase())){ Crypt.remove_pass(chan.toLowerCase()); - Admin.display_logged_out(); - Materialize.toast("Logged out", 4000); - }else{ - Materialize.toast("Not logged in", 4000); - } + Admin.display_logged_out(); + Materialize.toast("Logged out", 4000); + }else{ + Materialize.toast("Not logged in", 4000); + } }, display_logged_out: function() { - w_p = true; + w_p = true; adminpass = ""; - names = ["vote","addsongs","longsongs","frontpage", "allvideos", - "removeplay", "skip", "shuffle"]; + names = ["vote","addsongs","longsongs","frontpage", "allvideos", + "removeplay", "skip", "shuffle"]; document.getElementById("password").value = ""; $("#thumbnail_form").css("display", "none"); $("#description_form").css("display", "none"); - for (i = 0; i < names.length; i++) { - $("input[name="+names[i]+"]").attr("disabled", true); - } + for (i = 0; i < names.length; i++) { + $("input[name="+names[i]+"]").attr("disabled", true); + } - if($("#admin-lock").html() != "lock"){ - $("#admin-lock").removeClass("clickable"); + if($("#admin-lock").html() != "lock"){ + $("#admin-lock").removeClass("clickable"); $("#admin-lock").html("lock"); if(!Helper.mobilecheck()){ $('#admin-lock').tooltip('remove'); @@ -221,27 +217,24 @@ var Admin = { $(".playlist-tabs").removeClass("hide"); } - if($(".card-action").length !== 0 && - !Helper.contains($(".card-action").attr("class").split(" "), "hide") && !offline){ - $(".card-action").addClass("hide"); + if($(".card-action").length !== 0 && + !Helper.contains($(".card-action").attr("class").split(" "), "hide") && !offline){ + $(".card-action").addClass("hide"); } if($("ul.playlist-tabs-loggedIn .playlist-tab-links.active").attr("href") == "#suggestions") { $('ul.playlist-tabs').tabs('select_tab', 'wrapper'); $('ul.playlist-tabs-loggedIn').tabs('select_tab', 'wrapper'); - //$("#wrapper").removeClass("tabs_height"); } else { $('ul.playlist-tabs').tabs('select_tab', $(".playlist-tabs-loggedIn li a.active").attr("href").substring(1)); } $("#admin-lock").removeClass("clickable"); $("#password").attr("placeholder", "Enter admin password"); - //$("#top-button").removeClass("top-button-with-tabs"); }, - //function used in html onlick save: function(userpass){ - Admin.submitAdmin(document.getElementById("adminForm").elements, userpass); + Admin.submitAdmin(document.getElementById("adminForm").elements, userpass); }, set_conf: function(conf_array) @@ -249,7 +242,7 @@ var Admin = { music = conf_array.allvideos; longsongs = conf_array.longsongs; names = ["vote","addsongs","longsongs","frontpage", "allvideos", - "removeplay", "skip", "shuffle", "userpass"]; + "removeplay", "skip", "shuffle", "userpass"]; if(conf_array.adminpass === "" || !w_p){ @@ -294,33 +287,29 @@ var Admin = { $("#description_area").html(conf_array.description); } - /*if(conf_array.desc !== undefined) - { - document.getElementById("description").innerHTML = conf_array.desc; - }*/ }, submitAdmin: function(form, userpass_changed) { - voting = form.vote.checked; - addsongs = form.addsongs.checked; - longsongs = form.longsongs.checked; - frontpage = form.frontpage.checked; - allvideos = form.allvideos.checked; - removeplay = form.removeplay.checked; - skipping = form.skip.checked; - shuffling = form.shuffle.checked; + voting = form.vote.checked; + addsongs = form.addsongs.checked; + longsongs = form.longsongs.checked; + frontpage = form.frontpage.checked; + allvideos = form.allvideos.checked; + removeplay = form.removeplay.checked; + skipping = form.skip.checked; + shuffling = form.shuffle.checked; var pass_send = userpass == '' ? userpass : CryptoJS.SHA256(userpass).toString(); - configs = { + configs = { channel: chan.toLowerCase(), voting: voting, addsongs: addsongs, longsongs: longsongs, frontpage: frontpage, allvideos: allvideos, removeplay: removeplay, adminpass: adminpass, skipping: skipping, shuffling: shuffling, userpass: pass_send, userpass_changed: userpass_changed }; - Crypt.set_userpass(chan.toLowerCase(), CryptoJS.SHA256(userpass).toString()); - socket.emit("conf", configs); + Crypt.set_userpass(chan.toLowerCase(), CryptoJS.SHA256(userpass).toString()); + socket.emit("conf", configs); }, hide_settings: function(){ - $('#settings').sideNav('hide'); + $('#settings').sideNav('hide'); }, shuffle: function() diff --git a/server/public/assets/js/callback.js b/server/public/assets/js/callback.js index fbfb9c8d..7ae2d4a6 100755 --- a/server/public/assets/js/callback.js +++ b/server/public/assets/js/callback.js @@ -1,40 +1,40 @@ window.addEventListener("load", function(){ - var query = getQueryHash(window.location.hash); - var redirect = window.location.protocol + "//" + window.location.hostname + "/o_callback"; - var client_id; - var response; - var scope; + var query = getQueryHash(window.location.hash); + var redirect = window.location.protocol + "//" + window.location.hostname + "/o_callback"; + var client_id; + var response; + var scope; - if(query.spotify){ - client_id = "b934ecdd173648f5bcd38738af529d58"; - response = "token"; - scope = "playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public"; - state = query.nonce; - window.location.href = "https://accounts.spotify.com/authorize?client_id=" + client_id + "&scope=" + scope + "&show_dialog=false&response_type=" + response + "&redirect_uri=" + redirect + "&state=" + state; + if(query.spotify){ + client_id = "b934ecdd173648f5bcd38738af529d58"; + response = "token"; + scope = "playlist-read-private playlist-read-collaborative user-read-private playlist-modify-public"; + state = query.nonce; + window.location.href = "https://accounts.spotify.com/authorize?client_id=" + client_id + "&scope=" + scope + "&show_dialog=false&response_type=" + response + "&redirect_uri=" + redirect + "&state=" + state; - } else if (query.youtube) { - client_id = "944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com"; - response = "token"; - scope = "https://www.googleapis.com/auth/youtube"; - state = query.nonce; + } else if (query.youtube) { + client_id = "944988770273-butsmlr1aotlsskk8lmgvh0etqqekigf.apps.googleusercontent.com"; + response = "token"; + scope = "https://www.googleapis.com/auth/youtube"; + state = query.nonce; - //window.opener.callback(query); - window.location.href = "https://accounts.google.com/o/oauth2/v2/auth?client_id=" + client_id + "&response_type=" + response + "&state=" + state + "&redirect_uri=" + redirect + "&scope=" + scope; - } else { - var query_parameters = getQueryHash(window.location.hash); - window.opener.callback(query_parameters); - } + //window.opener.callback(query); + window.location.href = "https://accounts.google.com/o/oauth2/v2/auth?client_id=" + client_id + "&response_type=" + response + "&state=" + state + "&redirect_uri=" + redirect + "&scope=" + scope; + } else { + var query_parameters = getQueryHash(window.location.hash); + window.opener.callback(query_parameters); + } }); function getQueryHash(url){ - var temp_arr = url.substring(1).split("&"); - var done_obj = {}; - var splitted; - for(var i in temp_arr) { - splitted = temp_arr[i].split("="); - if(splitted.length == 2) { - done_obj[splitted[0]] = splitted[1]; - } - } - return done_obj; + var temp_arr = url.substring(1).split("&"); + var done_obj = {}; + var splitted; + for(var i in temp_arr) { + splitted = temp_arr[i].split("="); + if(splitted.length == 2) { + done_obj[splitted[0]] = splitted[1]; + } + } + return done_obj; } diff --git a/server/public/assets/js/chat.js b/server/public/assets/js/chat.js index 77fdcdbf..3205a855 100755 --- a/server/public/assets/js/chat.js +++ b/server/public/assets/js/chat.js @@ -1,162 +1,163 @@ var Chat = { - channel_received: 0, - all_received: 0, - chat_help: ["/name to change name", "/removename to remove name"], + channel_received: 0, + all_received: 0, + chat_help: ["/name to change name", "/removename to remove name"], - namechange: function(newName) - { - socket.emit("namechange", newName); - Crypt.set_name(newName); - }, + namechange: function(newName) + { + socket.emit("namechange", newName); + Crypt.set_name(newName); + }, - removename: function() - { - socket.emit("removename"); - Crypt.remove_name(); - }, + removename: function() + { + socket.emit("removename"); + Crypt.remove_name(); + }, - chat: function(data) - { - if(data.value.length > 150) - return; - if(data.value.startsWith("/name ")){ - Chat.namechange(data.value.substring(6)); - } else if(data.value.startsWith("/help")){ - if($(".chat-tab-li a.active").attr("href") == "#all_chat"){ - if($("#chatall").children().length > 100){ - $("#chatall").children()[0].remove() - } - for(var x = 0; x < Chat.chat_help.length; x++){ - var color = Helper.intToARGB(Helper.hashCode("System")); - if(color.length < 6) { - for(x = color.length; x < 6; x++){ - color = "0" + color; - } - } - color = Helper.hexToRgb(color.substring(0,6)); - var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); - $("#chatall").append("
  • System:
  • "); - var in_text = document.createTextNode(Chat.chat_help[x]); - $("#chatall li:last")[0].appendChild(in_text); - document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight; - } - } else { - if($("#chatchannel").children().length > 100){ - $("#chatchannel").children()[0].remove() - } - for(var x = 0; x < Chat.chat_help.length; x++){ + chat: function(data) + { + if(data.value.length > 150) + return; + if(data.value.startsWith("/name ")){ + Chat.namechange(data.value.substring(6)); + } else if(data.value.startsWith("/help")){ + if($(".chat-tab-li a.active").attr("href") == "#all_chat"){ + if($("#chatall").children().length > 100){ + $("#chatall").children()[0].remove() + } + for(var x = 0; x < Chat.chat_help.length; x++){ + var color = Helper.intToARGB(Helper.hashCode("System")); + if(color.length < 6) { + for(x = color.length; x < 6; x++){ + color = "0" + color; + } + } + color = Helper.hexToRgb(color.substring(0,6)); + var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); + $("#chatall").append("
  • System:
  • "); + var in_text = document.createTextNode(Chat.chat_help[x]); + $("#chatall li:last")[0].appendChild(in_text); + document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight; + } + } else { + if($("#chatchannel").children().length > 100){ + $("#chatchannel").children()[0].remove() + } + for(var x = 0; x < Chat.chat_help.length; x++){ - var color = Helper.intToARGB(Helper.hashCode("System")); - if(color.length < 6) { - for(x = color.length; x < 6; x++){ - color = "0" + color; - } - } - color = Helper.hexToRgb(color.substring(0,6)); - var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); - $("#chatchannel").append("
  • System:
  • "); - var in_text = document.createTextNode(Chat.chat_help[x]); - $("#chatchannel li:last")[0].appendChild(in_text); - document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight; - } + var color = Helper.intToARGB(Helper.hashCode("System")); + if(color.length < 6) { + for(x = color.length; x < 6; x++){ + color = "0" + color; + } + } + color = Helper.hexToRgb(color.substring(0,6)); + var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); + $("#chatchannel").append("
  • System:
  • "); + var in_text = document.createTextNode(Chat.chat_help[x]); + $("#chatchannel li:last")[0].appendChild(in_text); + document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight; + } - } - } else if(data.value.startsWith("/removename")){ - Chat.removename(); - } - else if($(".chat-tab-li a.active").attr("href") == "#all_chat") - socket.emit("all,chat", data.value); - else - socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); - data.value = ""; - return; - }, + } + } else if(data.value.startsWith("/removename")){ + Chat.removename(); + } else if($(".chat-tab-li a.active").attr("href") == "#all_chat"){ + socket.emit("all,chat", data.value); + } else { + socket.emit("chat", {channel: chan.toLowerCase(), data: data.value, pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))}); + } + data.value = ""; - allchat: function(inp) - { - //$("#chat-btn").css("color", "grey"); + return; + }, - if(inp.msg.substring(0,1) == ":" && !chat_active) - { - Chat.all_received += 1; - $("#favicon").attr("href", "public/images/highlogo.png"); - unseen = true; - chat_unseen = true; - if($(".chat-link span.badge.new.white").hasClass("hide")){ - $(".chat-link span.badge.new.white").removeClass("hide"); - } - var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received; - $(".chat-link span.badge.new.white").html(to_display); - //if(!blinking) Chat.chat_blink(); - //blink_interval = setTimeout(Chat.chat_blink, 2000); - } + allchat: function(inp) + { + //$("#chat-btn").css("color", "grey"); - if(document.hidden) - { - $("#favicon").attr("href", "public/images/highlogo.png"); - } + if(inp.msg.substring(0,1) == ":" && !chat_active) + { + Chat.all_received += 1; + $("#favicon").attr("href", "public/images/highlogo.png"); + unseen = true; + chat_unseen = true; + if($(".chat-link span.badge.new.white").hasClass("hide")){ + $(".chat-link span.badge.new.white").removeClass("hide"); + } + var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received; + $(".chat-link span.badge.new.white").html(to_display); + //if(!blinking) Chat.chat_blink(); + //blink_interval = setTimeout(Chat.chat_blink, 2000); + } - if($("#chatall").children().length > 100){ - $("#chatall").children()[0].remove() - } - var color = Helper.intToARGB(Helper.hashCode(inp.from)); - if(color.length < 6) { - for(x = color.length; x < 6; x++){ - color = "0" + color; - } - } - color = Helper.hexToRgb(color.substring(0,6)); - var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); - $("#chatall").append("
  • "+inp.from+"
  • "); - var in_text = document.createTextNode(inp.msg); - $("#chatall li:last")[0].appendChild(in_text); - document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight; - }, + if(document.hidden) + { + $("#favicon").attr("href", "public/images/highlogo.png"); + } - channelchat: function(data) - { - if(data.msg.substring(0,1) == ":" && !chat_active) - { - $("#favicon").attr("href", "public/images/highlogo.png"); - unseen = true; - chat_unseen = true; - Chat.channel_received += 1; - //blink_interval = setTimeout(Chat.chat_blink, 1000); - if($(".chat-link span.badge.new.white").hasClass("hide")){ - $(".chat-link span.badge.new.white").removeClass("hide"); - } - var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received; - $(".chat-link span.badge.new.white").html(to_display); - } + if($("#chatall").children().length > 100){ + $("#chatall").children()[0].remove() + } + var color = Helper.intToARGB(Helper.hashCode(inp.from)); + if(color.length < 6) { + for(x = color.length; x < 6; x++){ + color = "0" + color; + } + } + color = Helper.hexToRgb(color.substring(0,6)); + var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); + $("#chatall").append("
  • "+inp.from+"
  • "); + var in_text = document.createTextNode(inp.msg); + $("#chatall li:last")[0].appendChild(in_text); + document.getElementById("chatall").scrollTop = document.getElementById("chatall").scrollHeight; + }, - if($("#chatchannel").children().length > 100){ - $("#chatchannel").children()[0].remove() - } + channelchat: function(data) + { + if(data.msg.substring(0,1) == ":" && !chat_active) + { + $("#favicon").attr("href", "public/images/highlogo.png"); + unseen = true; + chat_unseen = true; + Chat.channel_received += 1; + //blink_interval = setTimeout(Chat.chat_blink, 1000); + if($(".chat-link span.badge.new.white").hasClass("hide")){ + $(".chat-link span.badge.new.white").removeClass("hide"); + } + var to_display = Chat.channel_received + Chat.all_received > 9 ? "9+" : Chat.channel_received + Chat.all_received; + $(".chat-link span.badge.new.white").html(to_display); + } - var color = Helper.intToARGB(Helper.hashCode(data.from)); - if(color.length < 6) { - for(x = color.length; x < 6; x++){ - color = "0" + color; - } - } - color = Helper.hexToRgb(color.substring(0,6)); - var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); - $("#chatchannel").append("
  • "+data.from+"
  • "); - var in_text = document.createTextNode(data.msg); - $("#chatchannel li:last")[0].appendChild(in_text); - document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight; - }, + if($("#chatchannel").children().length > 100){ + $("#chatchannel").children()[0].remove() + } - chat_blink: function() { - blinking = true; - $(".chat-link").attr("style", "color: grey !important;"); - setTimeout(function () { - $(".chat-link").attr("style", "color: white !important;"); - setTimeout(function() { - if(blinking) Chat.chat_blink(); - }, 1000); - }, 1000); - } + var color = Helper.intToARGB(Helper.hashCode(data.from)); + if(color.length < 6) { + for(x = color.length; x < 6; x++){ + color = "0" + color; + } + } + color = Helper.hexToRgb(color.substring(0,6)); + var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false); + $("#chatchannel").append("
  • "+data.from+"
  • "); + var in_text = document.createTextNode(data.msg); + $("#chatchannel li:last")[0].appendChild(in_text); + document.getElementById("chatchannel").scrollTop = document.getElementById("chatchannel").scrollHeight; + }, + + chat_blink: function() { + blinking = true; + $(".chat-link").attr("style", "color: grey !important;"); + setTimeout(function () { + $(".chat-link").attr("style", "color: white !important;"); + setTimeout(function() { + if(blinking) Chat.chat_blink(); + }, 1000); + }, 1000); + } }; diff --git a/server/public/assets/js/crypt.js b/server/public/assets/js/crypt.js index 6beb0fb5..75f3c97c 100755 --- a/server/public/assets/js/crypt.js +++ b/server/public/assets/js/crypt.js @@ -14,21 +14,21 @@ var Crypt = { } try{ - conf_arr = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt"); - }catch(err){ - conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt"); - } + conf_arr = Crypt.decrypt(Crypt.getCookie("_opt"), "_opt"); + }catch(err){ + conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt"); + } if(window.location.pathname != "/"){ try{ - Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase()); - }catch(err){ - Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase()); - } + Crypt.conf_pass = Crypt.decrypt(Crypt.getCookie(chan.toLowerCase()), chan.toLowerCase()); + }catch(err){ + Crypt.conf_pass = Crypt.decrypt(Crypt.create_cookie(chan.toLowerCase()), chan.toLowerCase()); + } - Hostcontroller.change_enabled(conf_arr.remote); - if(conf_arr.width != 100) Player.set_width(conf_arr.width); - if(conf_arr.name !== undefined && conf_arr.name !== "") Chat.namechange(conf_arr.name); + Hostcontroller.change_enabled(conf_arr.remote); + if(conf_arr.width != 100) Player.set_width(conf_arr.width); + if(conf_arr.name !== undefined && conf_arr.name !== "") Chat.namechange(conf_arr.name); } }, @@ -38,57 +38,57 @@ var Crypt = { } var decrypted = CryptoJS.AES.decrypt( - cookie,"0103060703080703080701", - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 + cookie,"0103060703080703080701", + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 } ); - return $.parseJSON(decrypted.toString(CryptoJS.enc.Utf8)); + return $.parseJSON(decrypted.toString(CryptoJS.enc.Utf8)); }, decrypt_pass: function(pass){ var decrypted = CryptoJS.AES.decrypt( - pass,socket.id, - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - } - ); + pass,socket.id, + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + } + ); - return decrypted.toString(CryptoJS.enc.Utf8); + return decrypted.toString(CryptoJS.enc.Utf8); }, encrypt: function(json_formated, cookie){ var to_encrypt = JSON.stringify(json_formated); - var encrypted = CryptoJS.AES.encrypt( - to_encrypt, - "0103060703080703080701", - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - } + var encrypted = CryptoJS.AES.encrypt( + to_encrypt, + "0103060703080703080701", + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + } ); - var CookieDate = new Date(); - CookieDate.setFullYear(CookieDate.getFullYear( ) +1); - if (location.protocol != "https:"){ - document.cookie = cookie+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"; - } else { - document.cookie = cookie+"="+encrypted.toString()+";secure;expires="+CookieDate.toGMTString()+";path=/;"; - } + var CookieDate = new Date(); + CookieDate.setFullYear(CookieDate.getFullYear( ) +1); + if (location.protocol != "https:"){ + document.cookie = cookie+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"; + } else { + document.cookie = cookie+"="+encrypted.toString()+";secure;expires="+CookieDate.toGMTString()+";path=/;"; + } }, encrypt_string: function(string){ var encrypted = CryptoJS.AES.encrypt( - string, - socket.id, - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - } + string, + socket.id, + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + } ); return encrypted.toString(); }, @@ -117,28 +117,28 @@ var Crypt = { if(name == "_opt") cookie_object = {volume: 100, width: 100, remote: true, name: "", offline: false}; else cookie_object = {passwords: {}}; - var string_it = JSON.stringify(cookie_object); + var string_it = JSON.stringify(cookie_object); - var encrypted = CryptoJS.AES.encrypt( - string_it, - "0103060703080703080701", - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - } + var encrypted = CryptoJS.AES.encrypt( + string_it, + "0103060703080703080701", + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + } ); - var CookieDate = new Date(); - CookieDate.setFullYear(CookieDate.getFullYear( ) +1); + var CookieDate = new Date(); + CookieDate.setFullYear(CookieDate.getFullYear( ) +1); - if (location.protocol != "https:"){ - document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"; - } else { - document.cookie = name+"="+encrypted.toString()+";secure;expires="+CookieDate.toGMTString()+";path=/;"; - } - //document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" - //document.cookie = na"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" - return Crypt.getCookie(name); + if (location.protocol != "https:"){ + document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;"; + } else { + document.cookie = name+"="+encrypted.toString()+";secure;expires="+CookieDate.toGMTString()+";path=/;"; + } + //document.cookie = name+"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" + //document.cookie = na"="+encrypted.toString()+";expires="+CookieDate.toGMTString()+";path=/;" + return Crypt.getCookie(name); }, set_pass: function(chan, pass){ @@ -196,13 +196,13 @@ var Crypt = { }, crypt_pass: function(pass){ - var encrypted = CryptoJS.AES.encrypt( - pass, - socket.id, - { - mode: CryptoJS.mode.CBC, - padding: CryptoJS.pad.Pkcs7 - } + var encrypted = CryptoJS.AES.encrypt( + pass, + socket.id, + { + mode: CryptoJS.mode.CBC, + padding: CryptoJS.pad.Pkcs7 + } ); return encrypted.toString(); }, @@ -217,8 +217,8 @@ var Crypt = { }, getCookie: function(name) { - var value = "; " + document.cookie; - var parts = value.split("; " + name + "="); - if (parts.length == 2) return parts.pop().split(";").shift(); + var value = "; " + document.cookie; + var parts = value.split("; " + name + "="); + if (parts.length == 2) return parts.pop().split(";").shift(); } }; diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js index 24f52b9a..8b8bbaae 100755 --- a/server/public/assets/js/embed.js +++ b/server/public/assets/js/embed.js @@ -1,15 +1,15 @@ -var song_title = ""; -var paused = false; -var player_ready = false; -var list_html = $("#list-song-html").html(); -var w_p = true; -var lazy_load = false; -var embed = true; -var vol = 100; -var adminpass = ""; -var mobile_beginning = false; -var durationBegun = false; +var song_title = ""; +var paused = false; +var player_ready = false; +var list_html = $("#list-song-html").html(); +var w_p = true; +var lazy_load = false; +var embed = true; +var vol = 100; +var adminpass = ""; +var mobile_beginning = false; +var durationBegun = false; var chromecastAvailable = false; var private_channel = false; var offline = false; @@ -18,8 +18,8 @@ var seekTo; var socket; var video_id; var previous_video_id; -var hash = window.location.hash.substring(1).split("&"); -var chan = hash[0]; +var hash = window.location.hash.substring(1).split("&"); +var chan = hash[0]; var autoplay = false; var color = "#808080"; var dragging = false; @@ -52,7 +52,7 @@ $(document).ready(function(){ }); socket.on("get_list", function(){ - setTimeout(function(){socket.emit('list', {channel: chan.toLowerCase(), pass: ''});},1000); + setTimeout(function(){socket.emit('list', {channel: chan.toLowerCase(), pass: ''});},1000); }); socket.on("viewers", function(view) @@ -60,7 +60,7 @@ $(document).ready(function(){ viewers = view; if(song_title !== undefined) - Player.getTitle(song_title, viewers); + Player.getTitle(song_title, viewers); }); @@ -102,11 +102,11 @@ $(document).on( "click", ".vote-container", function(e){ }); $(document).on("click", ".prev_page", function(e){ - e.preventDefault(); - List.dynamicContentPage(-1); + e.preventDefault(); + List.dynamicContentPage(-1); }); $(document).on("click", ".next_page", function(e){ - e.preventDefault(); - List.dynamicContentPage(1); + e.preventDefault(); + List.dynamicContentPage(1); }); diff --git a/server/public/assets/js/frontpage.js b/server/public/assets/js/frontpage.js index f70dde2f..3980958a 100755 --- a/server/public/assets/js/frontpage.js +++ b/server/public/assets/js/frontpage.js @@ -6,497 +6,475 @@ var frontpage = true; var socket; var rotation_timeout; -/* -function getCookie(cname) { - var name = cname + "="; - var ca = document.cookie.split(';'); - for(var i=0; i= 10 ? true : false, + winter: (new Date()).getMonth() >= 10 ? true : false, - times_rotated: 0, + times_rotated: 0, - all_channels: [], + all_channels: [], - frontpage_function: function(msg) - { - frontpage = true; + frontpage_function: function(msg) { + frontpage = true; - Helper.log("-----------"); - Helper.log("Frontpage fetch"); - Helper.log(msg); - Helper.log("------------"); - Frontpage.all_channels = msg.channels; - Frontpage.populate_channels(msg.channels, true); + Helper.log("-----------"); + Helper.log("Frontpage fetch"); + Helper.log(msg); + Helper.log("------------"); + Frontpage.all_channels = msg.channels; + Frontpage.populate_channels(msg.channels, true); - Frontpage.set_viewers(msg.viewers); - }, + Frontpage.set_viewers(msg.viewers); + }, - populate_channels: function(lists, popular) - { - $("#channels").empty(); + populate_channels: function(lists, popular) + { + $("#channels").empty(); - var num = 0; - var pinned; - if(lists[0].pinned == 1){ - pinned = lists.shift(); - } - //lists.sort(Frontpage.sortFunction); - if(popular) { - lists = lists.sort(Helper.predicate({ - name: 'viewers', - reverse: true - }, { - name: 'accessed', - reverse: true - }, { - name: 'count', - reverse: true - } - ) - ); - } else { - lists = lists.sort(Helper.predicate({ - name: 'viewers', - reverse: true - }, { - name: 'count', - reverse: true - } - ) - ); - } + var num = 0; + var pinned; + if(lists[0].pinned == 1){ + pinned = lists.shift(); + } + //lists.sort(Frontpage.sortFunction); + if(popular) { + lists = lists.sort(Helper.predicate({ + name: 'viewers', + reverse: true + }, { + name: 'accessed', + reverse: true + }, { + name: 'count', + reverse: true + })); + } else { + lists = lists.sort(Helper.predicate({ + name: 'viewers', + reverse: true + }, { + name: 'count', + reverse: true + })); + } - if(pinned !== undefined){ - lists.unshift(pinned); - } + if(pinned !== undefined){ + lists.unshift(pinned); + } - if(!Helper.mobilecheck()) { - clearTimeout(rotation_timeout); - Frontpage.add_backdrop(lists, 0); - } + if(!Helper.mobilecheck()) { + clearTimeout(rotation_timeout); + Frontpage.add_backdrop(lists, 0); + } - pre_card = $(channel_list); + pre_card = $(channel_list); - Helper.log("------------"); - Helper.log(pre_card); - Helper.log("-------------"); + Helper.log("------------"); + Helper.log(pre_card); + Helper.log("-------------"); - for(var x in lists) - { + for(var x in lists) + { - var chan = lists[x].channel; - if(num<12 || !popular) - { - var id = lists[x].id; - var viewers = lists[x].viewers; - var description = lists[x].description; - var img = "background-image:url('https://img.youtube.com/vi/"+id+"/hqdefault.jpg');"; - if(lists[x].thumbnail){ - img = "background-image:url('" + lists[x].thumbnail + "');"; - } + var chan = lists[x].channel; + if(num<12 || !popular) + { + var id = lists[x].id; + var viewers = lists[x].viewers; + var description = lists[x].description; + var img = "background-image:url('https://img.youtube.com/vi/"+id+"/hqdefault.jpg');"; + if(lists[x].thumbnail){ + img = "background-image:url('" + lists[x].thumbnail + "');"; + } - var song_count = lists[x].count; + var song_count = lists[x].count; - //$("#channels").append(channel_list); + //$("#channels").append(channel_list); - var card = pre_card.clone(); - if(lists[x].pinned == 1) - { - card.find(".pin").attr("style", "display:block;"); - card.find(".card").attr("title", "Pinned!"); - } - else - { - card.find(".pin").attr("style", "display:none;"); - card.find(".card").attr("title", ""); - } - card.find(".chan-name").text(chan); - card.find(".chan-name").attr("title", chan); - card.find(".chan-views").text(viewers); - card.find(".chan-songs").text(song_count); - card.find(".chan-bg").attr("style", img); - card.find(".chan-link").attr("href", chan + "/"); + var card = pre_card.clone(); + if(lists[x].pinned == 1) + { + card.find(".pin").attr("style", "display:block;"); + card.find(".card").attr("title", "Pinned!"); + } + else + { + card.find(".pin").attr("style", "display:none;"); + card.find(".card").attr("title", ""); + } + card.find(".chan-name").text(chan); + card.find(".chan-name").attr("title", chan); + card.find(".chan-views").text(viewers); + card.find(".chan-songs").text(song_count); + card.find(".chan-bg").attr("style", img); + card.find(".chan-link").attr("href", chan + "/"); - if(description != "" && !Helper.mobilecheck()){ - card.find(".card-title").text(chan); - card.find(".description_text").text(description); - description = ""; - } else { - card.find(".card-reveal").remove(); - card.find(".card").removeClass("sticky-action") - } + if(description != "" && !Helper.mobilecheck()){ + card.find(".card-title").text(chan); + card.find(".description_text").text(description); + description = ""; + } else { + card.find(".card-reveal").remove(); + card.find(".card").removeClass("sticky-action") + } - $("#channels").append(card.html()); + $("#channels").append(card.html()); - //$("#channels").append(card); - } - num++; - //if(num>19)break; - } - var options_list = lists.slice(); + //$("#channels").append(card); + } + num++; + //if(num>19)break; + } + var options_list = lists.slice(); - options_list = options_list.sort(Frontpage.sortFunction_active); - var data = {}; - //num = 0; - for(var x in options_list){ - //if(options_list[x].count > 5 && Math.floor((new Date).getTime()/1000) - options_list[x].accessed < 604800){ - /*var chan = options_list[x].channel; - output+="