diff --git a/base/base.user.js b/base/base.user.js index 9d23621..0f5cb74 100644 --- a/base/base.user.js +++ b/base/base.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions -// @version 1.10 +// @version 1.11 // @description Multiple solutions for blocking Twitch ads // @author pixeltris // @match *://*.twitch.tv/* @@ -15,7 +15,7 @@ scope.OPT_ROLLING_DEVICE_ID = false; scope.OPT_MODE_STRIP_AD_SEGMENTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED = false; - scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; + scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_REGULAR_PLAYER_TYPE = 'site'; @@ -34,7 +34,7 @@ // Rolling device id crap... TODO: improve this var charTable = []; for (var i = 97; i <= 122; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 65; i <= 90; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 48; i <= 57; i++) { charTable.push(String.fromCharCode(i)); } var bs = 'eVI6jx47kJvCFfFowK86eVI6jx47kJvC'; - var di = (new Date()).getYear() + (new Date()).getMonth() + ((new Date()).getDate() / 7) | 0; + var di = (new Date()).getUTCFullYear() + (new Date()).getUTCMonth() + ((new Date()).getUTCDate() / 7) | 0; for (var i = 0; i < bs.length; i++) { scope.gql_device_id_rolling += charTable[(bs.charCodeAt(i) ^ di) % charTable.length]; } diff --git a/notify-reload/notify-reload-ublock-origin.js b/notify-reload/notify-reload-ublock-origin.js index 46e9acf..a487ee5 100644 --- a/notify-reload/notify-reload-ublock-origin.js +++ b/notify-reload/notify-reload-ublock-origin.js @@ -6,7 +6,7 @@ twitch-videoad.js application/javascript scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; - scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; + scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_REGULAR_PLAYER_TYPE = 'site'; @@ -25,7 +25,7 @@ twitch-videoad.js application/javascript // Rolling device id crap... TODO: improve this var charTable = []; for (var i = 97; i <= 122; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 65; i <= 90; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 48; i <= 57; i++) { charTable.push(String.fromCharCode(i)); } var bs = 'eVI6jx47kJvCFfFowK86eVI6jx47kJvC'; - var di = (new Date()).getYear() + (new Date()).getMonth() + ((new Date()).getDate() / 7) | 0; + var di = (new Date()).getUTCFullYear() + (new Date()).getUTCMonth() + ((new Date()).getUTCDate() / 7) | 0; for (var i = 0; i < bs.length; i++) { scope.gql_device_id_rolling += charTable[(bs.charCodeAt(i) ^ di) % charTable.length]; } diff --git a/notify-reload/notify-reload.user.js b/notify-reload/notify-reload.user.js index 2d877cc..705fea1 100644 --- a/notify-reload/notify-reload.user.js +++ b/notify-reload/notify-reload.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name TwitchAdSolutions (notify-reload) // @namespace https://github.com/pixeltris/TwitchAdSolutions -// @version 1.10 +// @version 1.11 // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js // @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-reload/notify-reload.user.js // @description Multiple solutions for blocking Twitch ads (notify-reload) @@ -17,7 +17,7 @@ scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; - scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; + scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = true; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_REGULAR_PLAYER_TYPE = 'site'; @@ -36,7 +36,7 @@ // Rolling device id crap... TODO: improve this var charTable = []; for (var i = 97; i <= 122; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 65; i <= 90; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 48; i <= 57; i++) { charTable.push(String.fromCharCode(i)); } var bs = 'eVI6jx47kJvCFfFowK86eVI6jx47kJvC'; - var di = (new Date()).getYear() + (new Date()).getMonth() + ((new Date()).getDate() / 7) | 0; + var di = (new Date()).getUTCFullYear() + (new Date()).getUTCMonth() + ((new Date()).getUTCDate() / 7) | 0; for (var i = 0; i < bs.length; i++) { scope.gql_device_id_rolling += charTable[(bs.charCodeAt(i) ^ di) % charTable.length]; } diff --git a/notify-strip/notify-strip-ublock-origin.js b/notify-strip/notify-strip-ublock-origin.js index 5874e2b..20dabd2 100644 --- a/notify-strip/notify-strip-ublock-origin.js +++ b/notify-strip/notify-strip-ublock-origin.js @@ -6,7 +6,7 @@ twitch-videoad.js application/javascript scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; - scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; + scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_REGULAR_PLAYER_TYPE = 'site'; @@ -25,7 +25,7 @@ twitch-videoad.js application/javascript // Rolling device id crap... TODO: improve this var charTable = []; for (var i = 97; i <= 122; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 65; i <= 90; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 48; i <= 57; i++) { charTable.push(String.fromCharCode(i)); } var bs = 'eVI6jx47kJvCFfFowK86eVI6jx47kJvC'; - var di = (new Date()).getYear() + (new Date()).getMonth() + ((new Date()).getDate() / 7) | 0; + var di = (new Date()).getUTCFullYear() + (new Date()).getUTCMonth() + ((new Date()).getUTCDate() / 7) | 0; for (var i = 0; i < bs.length; i++) { scope.gql_device_id_rolling += charTable[(bs.charCodeAt(i) ^ di) % charTable.length]; } diff --git a/notify-strip/notify-strip.user.js b/notify-strip/notify-strip.user.js index ec629ff..25fe545 100644 --- a/notify-strip/notify-strip.user.js +++ b/notify-strip/notify-strip.user.js @@ -1,7 +1,7 @@ // ==UserScript== // @name TwitchAdSolutions (notify-strip) // @namespace https://github.com/pixeltris/TwitchAdSolutions -// @version 1.10 +// @version 1.11 // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js // @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/notify-strip/notify-strip.user.js // @description Multiple solutions for blocking Twitch ads (notify-strip) @@ -17,7 +17,7 @@ scope.OPT_ROLLING_DEVICE_ID = true; scope.OPT_MODE_STRIP_AD_SEGMENTS = true; scope.OPT_MODE_NOTIFY_ADS_WATCHED = true; - scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = true; + scope.OPT_MODE_NOTIFY_ADS_WATCHED_MIN_REQUESTS = false; scope.OPT_MODE_NOTIFY_ADS_WATCHED_RELOAD_PLAYER_ON_AD_SEGMENT = false; scope.OPT_BACKUP_PLAYER_TYPE = 'picture-by-picture';//'picture-by-picture';'thunderdome'; scope.OPT_REGULAR_PLAYER_TYPE = 'site'; @@ -36,7 +36,7 @@ // Rolling device id crap... TODO: improve this var charTable = []; for (var i = 97; i <= 122; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 65; i <= 90; i++) { charTable.push(String.fromCharCode(i)); } for (var i = 48; i <= 57; i++) { charTable.push(String.fromCharCode(i)); } var bs = 'eVI6jx47kJvCFfFowK86eVI6jx47kJvC'; - var di = (new Date()).getYear() + (new Date()).getMonth() + ((new Date()).getDate() / 7) | 0; + var di = (new Date()).getUTCFullYear() + (new Date()).getUTCMonth() + ((new Date()).getUTCDate() / 7) | 0; for (var i = 0; i < bs.length; i++) { scope.gql_device_id_rolling += charTable[(bs.charCodeAt(i) ^ di) % charTable.length]; }