From 789f7c00f99f67b6d7f3c4313a3f60c039ef05dd Mon Sep 17 00:00:00 2001 From: Miikka Lahtinen Date: Tue, 23 Nov 2021 17:06:32 +0200 Subject: [PATCH 1/5] Cleanup unnecessary and unused global variables --- web/js/callbacks.js | 6 ------ web/js/functions.js | 2 +- web/js/init.js | 9 --------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/web/js/callbacks.js b/web/js/callbacks.js index 3808f1ec..1fce7f28 100644 --- a/web/js/callbacks.js +++ b/web/js/callbacks.js @@ -23,7 +23,6 @@ function videoSeeked(time) { } } function videoPlaying() { - //PLAYING_VID = getLiteralPlayingVidID(); if (controlsVideo()) { videoGetTime(function (time) { SEEK_TO = time; @@ -48,11 +47,6 @@ function videoPaused() { socket.on("createPlayer", function (data) { console.log('createPlayer', data); - - if (!INIT_TIME) { - INIT_TIME = data.time; - } - const isNew = ACTIVE.videoid != data.video.videoid; unfuckPlaylist(); diff --git a/web/js/functions.js b/web/js/functions.js index b35a4245..925f59f1 100644 --- a/web/js/functions.js +++ b/web/js/functions.js @@ -1403,7 +1403,7 @@ function doSqueeNotify() { clearInterval(CHAT_NOTIFY); CHAT_NOTIFY = setInterval(function () { if (document.title == WINDOW_TITLE) { - document.title = NOTIFY_TITLE; + document.title = "Chat!"; } else { document.title = WINDOW_TITLE; diff --git a/web/js/init.js b/web/js/init.js index 0702a092..43cb96d1 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -142,8 +142,6 @@ var btEvents = (function () { var PLAYER = false; var LEADER = false; -var ADMIN = false; -var MOD = false; var NAME = false; var TIME = new Date(); var TYPE = -1; @@ -153,14 +151,9 @@ var IGNORELIST = []; var CONNECTED = 0; var PLAYLIST = new LinkedList.Circular(); var ACTIVE = new Video(); -var PLAYING_VID; -var HB_DELAY = 5000; -var leaderHeartbeat = false; var PLAYLIST_DRAGFROM = 0; var PLAYLIST_DRAGTO = 0; var PLAYLIST_DRAGSANITY = ''; -var LEGACY_PLAYER = false; -var INIT_TIME = 0; var SEEK_FROM = 0; var SEEK_TO = 0; var HISTORY = []; @@ -173,8 +166,6 @@ var CHAT_NOTIFY = false; var VIDEO_TYPE = false; var MY_FLAIR_ID = 0; var DRINKS = 0; -var LAST_SEND_TIME = false; -var NOTIFY_TITLE = "Chat!"; var NOTIFY = window.NOTIFY || new Audio(CDN_ORIGIN + "/sounds/notify.wav"); // buffers automatically when created var DRINK = window.DRINK || new Audio(CDN_ORIGIN + "/sounds/drink.wav"); // buffers automatically when created var ATTENTION = window.ATTENTION || new Audio(CDN_ORIGIN + "/sounds/attention.wav"); // [](/shift6) From df3ffb8c2ccfe0c9da7291679e3eef5d406168cf Mon Sep 17 00:00:00 2001 From: Miikka Lahtinen Date: Tue, 23 Nov 2021 17:24:30 +0200 Subject: [PATCH 2/5] Remove unused game functions --- web/js/functions.js | 63 --------------------------------------------- web/js/init.js | 1 - 2 files changed, 64 deletions(-) diff --git a/web/js/functions.js b/web/js/functions.js index 925f59f1..da0a6616 100644 --- a/web/js/functions.js +++ b/web/js/functions.js @@ -2291,69 +2291,6 @@ function secondsToString(seconds) { return days + ":" + hours + ":" + minutes + ":" + seconds; } -function isMainGameOn() { - TIME = new Date(); - // Main game runs from 4AM Saturday UTC "to" 10AM Saturday UTC. - if ( - TIME.getUTCDay() == 6 && // 6 for Saturday - TIME.getUTCHours() >= 4 && - TIME.getUTCHours() < 10 - ) { - return true; - } - return false; -} -function timeToMainGame() { - var WEEK = 604800; - TIME = new Date(); - GAME = new Date(); - var startDay = 6; - var startHr = 4; - var stopHr = 10; - - var dayOffset = 0; - var day = TIME.getUTCDay(); - while (day != startDay) { - dayOffset++; - day++; - if (day >= 7) { - day = 0; - } - } - - console.log(TIME.getUTCDate() + dayOffset); - GAME.setUTCDate(TIME.getUTCDate() + dayOffset); - GAME.setUTCHours(startHr); - GAME.setUTCMinutes(0); - GAME.setUTCSeconds(-1); - - var timeUntilGameStarts = (GAME.getTime() / 1000) - (TIME.getTime() / 1000); - if (timeUntilGameStarts < 0) { - timeUntilGameStarts += WEEK; - } - - GAME.setUTCHours(stopHr); - - var timeUntilGameStops = (GAME.getTime() / 1000) - (TIME.getTime() / 1000); - if (timeUntilGameStops < 0) { - timeUntilGameStops += WEEK; - } - - return { - start: timeUntilGameStarts, - stop: timeUntilGameStops - }; -} -/*function isMainGameOn(){ - TIME = new Date(); - var gameStartsAt = new Date() - // Get days to friday. - var dtf = (5 - TIME.getUTCDay()) - - var dow = DATE.getUTCDay() - - if(dow = DATE.getUTCDay() -}*/ function detectName(nick, msg) { var list = ''; if (nick) { diff --git a/web/js/init.js b/web/js/init.js index 43cb96d1..a5a53e25 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -143,7 +143,6 @@ var btEvents = (function () { var PLAYER = false; var LEADER = false; var NAME = false; -var TIME = new Date(); var TYPE = -1; var CHATLIST = {}; var TOGGLEABLES = {}; From 18030968db52d7de040a58f695f60dbfaee230d9 Mon Sep 17 00:00:00 2001 From: Miikka Lahtinen Date: Tue, 23 Nov 2021 17:29:51 +0200 Subject: [PATCH 3/5] Remove drag globals, use parent element instead to store --- web/js/functions.js | 18 ++++++++---------- web/js/init.js | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/web/js/functions.js b/web/js/functions.js index da0a6616..05a6110e 100644 --- a/web/js/functions.js +++ b/web/js/functions.js @@ -990,19 +990,17 @@ function handleACL() { }); playlist.sortable({ start: function (event, ui) { - PLAYLIST_DRAGFROM = ui.item.index(); - PLAYLIST_DRAGSANITY = ui.item.data('plobject').videoid; + ui.item.parent().data('drag', { + from: ui.item.index(), + sanityid: ui.item.data('plobject').videoid + }); }, update: function (event, ui) { - PLAYLIST_DRAGTO = ui.item.index(); if (controlsPlaylist()) { - var data = { - from: PLAYLIST_DRAGFROM, - to: PLAYLIST_DRAGTO, - sanityid: PLAYLIST_DRAGSANITY - }; - dbg(data); - socket.emit("sortPlaylist", data); + socket.emit("sortPlaylist", { + ...ui.item.parent().data('drag'), + to: ui.item.index() + }); } $(this).sortable('cancel'); }, diff --git a/web/js/init.js b/web/js/init.js index a5a53e25..85a1c725 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -150,9 +150,6 @@ var IGNORELIST = []; var CONNECTED = 0; var PLAYLIST = new LinkedList.Circular(); var ACTIVE = new Video(); -var PLAYLIST_DRAGFROM = 0; -var PLAYLIST_DRAGTO = 0; -var PLAYLIST_DRAGSANITY = ''; var SEEK_FROM = 0; var SEEK_TO = 0; var HISTORY = []; From 63105256546955b1677f0f42a5a42bc1cf6ac7f4 Mon Sep 17 00:00:00 2001 From: Miikka Lahtinen Date: Tue, 23 Nov 2021 17:34:54 +0200 Subject: [PATCH 4/5] Readd NOTIFY_TITLE for easier access --- web/js/functions.js | 2 +- web/js/init.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/web/js/functions.js b/web/js/functions.js index 05a6110e..76a23203 100644 --- a/web/js/functions.js +++ b/web/js/functions.js @@ -1401,7 +1401,7 @@ function doSqueeNotify() { clearInterval(CHAT_NOTIFY); CHAT_NOTIFY = setInterval(function () { if (document.title == WINDOW_TITLE) { - document.title = "Chat!"; + document.title = NOTIFY_TITLE; } else { document.title = WINDOW_TITLE; diff --git a/web/js/init.js b/web/js/init.js index 85a1c725..b7cd90c6 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -162,6 +162,7 @@ var CHAT_NOTIFY = false; var VIDEO_TYPE = false; var MY_FLAIR_ID = 0; var DRINKS = 0; +var NOTIFY_TITLE = "Chat!"; var NOTIFY = window.NOTIFY || new Audio(CDN_ORIGIN + "/sounds/notify.wav"); // buffers automatically when created var DRINK = window.DRINK || new Audio(CDN_ORIGIN + "/sounds/drink.wav"); // buffers automatically when created var ATTENTION = window.ATTENTION || new Audio(CDN_ORIGIN + "/sounds/attention.wav"); // [](/shift6) From c37d260eb3c5af32ff6ee76aef22b5cb4ed28718 Mon Sep 17 00:00:00 2001 From: Miikka Lahtinen Date: Tue, 23 Nov 2021 18:30:07 +0200 Subject: [PATCH 5/5] Use oneliner instead of function for highlitght list initialisation --- web/js/init.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/web/js/init.js b/web/js/init.js index b7cd90c6..3fe38248 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -177,7 +177,6 @@ var VOLUME = false; var PLAYERS = {}; var IGNORE_GHOST_MESSAGES = false; var ADMIN_LOG = []; -var HIGHLIGHT_LIST = []; var ACTIVE_CHAT = 'main'; var MAIN_NOTIFY = false; var ADMIN_NOTIFY = false; @@ -186,18 +185,7 @@ var POLL_TITLE_FORMAT = ''; var POLL_OPTIONS = []; var DEBUG_DUMPS = []; -(function () { - // This isn't 100% necessary, but it keeps things a bit tidier by not making storedList global - var storedList = localStorage.getItem('highlightList'); - if (storedList != null) { - var storedListArray = storedList.split(';'); - for (var i in storedListArray) { - if (storedListArray[i].length > 0) { - HIGHLIGHT_LIST.push(storedListArray[i]); - } - } - } -})(); +var HIGHLIGHT_LIST = (localStorage.getItem('highlightList') || '').split(';').filter(n => n.length > 0); try { const stored = localStorage.getItem('ignoreList');