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

Fixed so users that has blocked cookies still are able to play

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-19 22:58:51 +02:00
parent c0bd3de5af
commit cc84a02cd2
7 changed files with 70 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/assets/js/channel.js
View File

@@ -32,7 +32,6 @@ var Channel = {
}
//Player.soundcloud_player = document.querySelector("#soundcloud_player");
}
List.calculate_song_heights();
Admin.logged_in = false;
Admin.display_logged_out();
@@ -494,7 +493,8 @@ var Channel = {
var add = "";
w_p = true;
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
} else if(url_split[3] === "") {
/*if(client) {
var host = window.location.hostname.split(".");

3
server/public/assets/js/crypt.js
View File

@@ -20,7 +20,7 @@ var Crypt = {
} catch(err) {
conf_arr = Crypt.decrypt(Crypt.create_cookie("_opt"), "_opt");
}
if(window.location.pathname != "/") {
Hostcontroller.change_enabled(conf_arr.remote);
if(conf_arr.width != 100) Player.set_width(conf_arr.width);
@@ -31,6 +31,7 @@ var Crypt = {
if(Crypt.getCookie(name) === undefined) {
cookie = Crypt.create_cookie(name);
}
if(cookie == undefined && name == "_opt") return {"volume":100,"width":100,"remote":true,"name":"","offline":false};
/*var key = btoa("0103060703080703080701") + btoa("0103060703080703080701");
key = key.substring(0,32);
key = btoa(key);

8
server/public/assets/js/embed.js
View File

@@ -4,6 +4,12 @@ var gotten_np = false;
var song_title = "";
var paused = false;
var client = false;
var _VERSION;
try {
_VERSION = localStorage.getItem("VERSION");
} catch(e) {
_VERSION = 6;
}
var startTime = 0;
var full_playlist;
var hostMode = false;
@@ -383,7 +389,7 @@ function change_offline(enabled, already_offline){
socket.emit("pos", {channel: chan.toLowerCase()});
var add = "";
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
Helper.removeClass("#controls", "ewresize");
}
}

14
server/public/assets/js/functions.js
View File

@@ -275,7 +275,7 @@ function emit_list() {
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(p == undefined) p = "";*/
if(socket.id) {
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
} else {
setTimeout(function(){
emit_list();
@@ -666,7 +666,7 @@ function get_list_listener(){
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
/*var p = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(p == undefined) p = "";*/
socket.emit("list", { offline: offline, version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", { offline: offline, version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
});
socket.on("id_chromecast", function(msg) {
chromecast_specs_sent = true;
@@ -746,11 +746,15 @@ function setup_host_listener(id){
}
function enable_debug(){
localStorage.debug = true;
try {
localStorage.debug = true;
} catch(e){}
}
function disable_debug(){
localStorage.debug = false;
try {
localStorage.debug = false;
} catch(e){}
}
function embed_code(autoplay, width, height, color, embed_code, embed_local){
@@ -859,7 +863,7 @@ function change_offline(enabled, already_offline){
socket.on("color", Player.setBGimage);
socket.emit("pos", {channel: chan.toLowerCase()});
var add = "";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
Helper.removeClass("#controls", "ewresize");
}
}

8
server/public/assets/js/helpers.js
View File

@@ -19,7 +19,13 @@ var Helper = {
},
log: function(to_log) {
if(localStorage.debug === "true") {
var _DEBUG;
try {
_DEBUG = localStorage.getItem("debug");
} catch(e) {
_DEBUG = false;
}
if(_DEBUG === "true") {
console.log("------------ " + new Date() + " ------------");/*RemoveLogging:skip*/
for(var i = 0; i < to_log.length; i++) {
console.log(to_log[i]);/*RemoveLogging:skip*/

6
server/public/assets/js/hostcontroller.js
View File

@@ -41,7 +41,9 @@ var Hostcontroller = {
Playercontrols.visualVolume(arr.value);
Player.setVolume(arr.value);
Player.soundcloud_player.setVolume(arr.value / 100);
localStorage.setItem("volume", arr.value);
try {
localStorage.setItem("volume", arr.value);
} catch(e){}
Playercontrols.choose_button(arr.value, false);
} catch(e) {}
} else if(arr.type == "channel") {
@@ -57,7 +59,7 @@ var Hostcontroller = {
w_p = true;
var add = "";
//if(private_channel) add = Crypt.getCookie("_uI") + "_";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: add + chan.toLowerCase()});
socket.emit("list", {version: parseInt(_VERSION), channel: add + chan.toLowerCase()});
window.history.pushState("object or string", "Title", "/"+chan.toLowerCase());
} else if(arr.type == "pause") {

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

@@ -5,6 +5,12 @@ var client = false;
if(domain.length > 0 && domain[0] == "client") {
client = true;
}
var _VERSION;
try {
_VERSION = localStorage.getItem("VERSION");
} catch(e) {
_VERSION = 6;
}
var soundcloud_enabled = true;
var local_new_channel = false;
var sc_need_initialization = false;
@@ -101,11 +107,13 @@ var guid = "";
var castSession;
var width_timeout;
var tap_target_timeout;
if(localStorage.debug === undefined){
var debug = false;
localStorage.debug = debug;
}
var debug;
try {
if(localStorage.debug === undefined){
debug = false;
localStorage.debug = debug;
}
}catch(e){debug = false;}
var image_timeout;
var result_html;
@@ -204,15 +212,23 @@ window.zoff = {
window.addEventListener("DOMContentLoaded", function() {
addDynamicListeners();
if(!localStorage.getItem("VERSION") || parseInt(localStorage.getItem("VERSION")) != VERSION) {
localStorage.setItem("VERSION", VERSION);
if(!_VERSION || parseInt(_VERSION) != VERSION) {
try {
localStorage.setItem("VERSION", VERSION);
} catch(e){}
}
if(!fromFront && window.location.pathname != "/") Channel.init();
else if(!fromChannel && window.location.pathname == "/"){
Frontpage.init();
}
if(!localStorage.ok_cookie){
var okCookie;
try {
okCookie = localStorage.ok_cookie;
} catch(e) {
okCookie = false;
}
if(!okCookie){
before_toast();
M.toast({html: "This website uses cookies! <a class='waves-effect waves-light btn light-green' href='#' id='cookieok' style='cursor:pointer;pointer-events:all;margin-left:10px;'> ok</a><a class='waves-effect waves-light btn orange lighten' href='#cookies' id='cookieinfo' style='cursor:pointer;pointer-events:all;margin-left:10px;'> info</a>", displayLength: 10000000});
}
@@ -404,7 +420,13 @@ initializeCastApi = function() {
Helper.css(".castButton", "display", "block");
Helper.addClass(".volume-container", "volume-container-cast");
cast_ready_connect = true;
if((!localStorage.getItem("_chSeen") || localStorage.getItem("_chSeen") != "seen") && !client) {
var _chSeen;
try {
_chSeen = localStorage.getItem("_chSeen");
} catch(e){
_chSeen = false;
}
if((!_chSeen || _chSeen != "seen") && !client) {
Helper.css(".castButton", "display", "block");
showDiscovery = true;
var elem = document.querySelector('.tap-target');
@@ -413,7 +435,9 @@ initializeCastApi = function() {
tap_target_timeout = setTimeout(function() {
instance.close();
}, 4000);
localStorage.setItem("_chSeen", "seen");
try {
localStorage.setItem("_chSeen", "seen");
} catch(e){}
Helper.removeClass('.castButton', 'castButton-white-active');
}
} else if(event.castState == "NO_DEVICES_AVAILABLE"){
@@ -528,7 +552,9 @@ function addDynamicListeners() {
addListener("click", '#cookieok', function(e) {
this.preventDefault();
M.Toast.getInstance(e.parentElement).dismiss();
localStorage.ok_cookie = true;
try {
localStorage.ok_cookie = true;
} catch(e){}
});
addListener("click", "#cookieinfo", function(e) {
@@ -703,7 +729,7 @@ function addDynamicListeners() {
temp_user_pass = document.getElementById("user-pass-input").value;
document.getElementById("user-pass-input").value = "";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
socket.emit("list", {version: parseInt(_VERSION), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
} else {
M.Modal.getInstance(document.getElementById("user_password")).close();
userpass = document.getElementById("user-pass-input").value;
@@ -729,7 +755,7 @@ function addDynamicListeners() {
if(user_auth_started) {
temp_user_pass = document.getElementById("user-pass-input").value;
document.getElementById("user-pass-input").value = "";
socket.emit("list", {version: parseInt(localStorage.getItem("VERSION")), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
socket.emit("list", {version: parseInt(_VERSION), channel: chan.toLowerCase(), pass: Crypt.crypt_pass(temp_user_pass)});
} else {
M.Modal.getInstance(document.getElementById("user_password")).close();
userpass = document.getElementById("user-pass-input").value;