Mirrors/TwitchAdSolutions
1
0
Fork 0
mirror of https://github.com/pixeltris/TwitchAdSolutions.git synced 2025-04-29 22:24:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add urls to build_scripts for versioning userscript

Browse Source
This commit is contained in:
pixeltris 2021-01-15 04:27:27 +00:00
parent 1fb6653a9f
commit d322143f12
9 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/base.user.js
View File

@ -1,7 +1,7 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @description Multiple solutions for blocking Twitch ads
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*

6
dyn-skip-midroll-alt/dyn-skip-midroll-alt.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip-midroll-alt/dyn-skip-midroll-alt.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip-midroll-alt/dyn-skip-midroll-alt.user.js
// @description Multiple solutions for blocking Twitch ads (dyn-skip-midroll-alt)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
dyn-skip-midroll/dyn-skip-midroll.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip-midroll/dyn-skip-midroll.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip-midroll/dyn-skip-midroll.user.js
// @description Multiple solutions for blocking Twitch ads (dyn-skip-midroll)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
dyn-skip/dyn-skip.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip/dyn-skip.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-skip/dyn-skip.user.js
// @description Multiple solutions for blocking Twitch ads (dyn-skip)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
dyn-video-swap/dyn-video-swap.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-video-swap/dyn-video-swap.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn-video-swap/dyn-video-swap.user.js
// @description Multiple solutions for blocking Twitch ads (dyn-video-swap)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
dyn/dyn.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn/dyn.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/dyn/dyn.user.js
// @description Multiple solutions for blocking Twitch ads (dyn)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
mute-black/mute-black.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/mute-black/mute-black.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/mute-black/mute-black.user.js
// @description Multiple solutions for blocking Twitch ads (mute-black)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

6
proxy-m3u8/proxy-m3u8.user.js
View File

@ -1,8 +1,10 @@
// ==UserScript== // ==UserScript==
// @name TwitchAdSolutions // @name TwitchAdSolutions
// @namespace https://github.com/pixeltris/TwitchAdSolutions // @namespace https://github.com/pixeltris/TwitchAdSolutions
// @version 1.0 // @version 1.1
// @description Multiple solutions for blocking Twitch ads // @updateURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/proxy-m3u8/proxy-m3u8.user.js
// @downloadURL https://github.com/pixeltris/TwitchAdSolutions/raw/master/proxy-m3u8/proxy-m3u8.user.js
// @description Multiple solutions for blocking Twitch ads (proxy-m3u8)
// @author pixeltris // @author pixeltris
// @match *://*.twitch.tv/* // @match *://*.twitch.tv/*
// @run-at document-start // @run-at document-start

33
utils.cs
View File

@ -14,7 +14,7 @@ namespace TwitchAdUtils
{ {
class Program class Program
{ {
static string ClientID = "kimne78kx3ncx6brgo4mv6wki5h1ko"; static string ClientID = "kimne78kx3ncx6brgo4mv6wki5h1ko";//ilfexgv3nnljz3isbm257gzwrzr7bi - Xtra for Twitch
static string UserAgentChrome = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"; static string UserAgentChrome = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36";
static string UserAgentFirefox = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"; static string UserAgentFirefox = "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0";
static string UserAgent = UserAgentChrome; static string UserAgent = UserAgentChrome;
@ -116,10 +116,18 @@ namespace TwitchAdUtils
for (int i = 0; i < lines.Length; i++) for (int i = 0; i < lines.Length; i++)
{ {
string line = lines[i]; string line = lines[i];
if (line.Trim().StartsWith("// Modify options based on mode")) string lineTrimmed = line.Trim();
if (lineTrimmed.StartsWith("// Modify options based on mode"))
{ {
modifiedOptions = true; modifiedOptions = true;
} }
if (lineTrimmed.StartsWith("// @description"))
{
string url = "https://github.com/pixeltris/TwitchAdSolutions/raw/master/" + dirInfo.Name + "/" + dirInfo.Name + suffixUserscript;
sbUserscript.AppendLine("// @updateURL " + url);
sbUserscript.AppendLine("// @downloadURL " + url);
line = line += " (" + dirInfo.Name + ")";
}
if (!modifiedOptions) if (!modifiedOptions)
{ {
if (!foundUserScriptEnd) if (!foundUserScriptEnd)
@ -131,7 +139,7 @@ namespace TwitchAdUtils
foundUserScriptEnd = true; foundUserScriptEnd = true;
} }
} }
else if (line.Trim().StartsWith("'use strict'")) else if (lineTrimmed.StartsWith("'use strict'"))
{ {
sbUserscript.AppendLine(line); sbUserscript.AppendLine(line);
sbUblock.AppendLine(" if ( /(^|\\.)twitch\\.tv$/.test(document.location.hostname) === false ) { return; }"); sbUblock.AppendLine(" if ( /(^|\\.)twitch\\.tv$/.test(document.location.hostname) === false ) { return; }");
@ -302,7 +310,8 @@ namespace TwitchAdUtils
Console.WriteLine("has ad " + DateTime.Now.TimeOfDay); Console.WriteLine("has ad " + DateTime.Now.TimeOfDay);
if (ShouldDenyAd) if (ShouldDenyAd)
{ {
DeclineAd(uniqueId, streamM3u8); DeclineAd(uniqueId, streamM3u8, sig, token, true);
DeclineAd(uniqueId, streamM3u8, sig, token, false);
} }
} }
else else
@ -388,7 +397,7 @@ namespace TwitchAdUtils
return defaultValue; return defaultValue;
} }
static void DeclineAd(string uniqueId, string streamM3u8) static void DeclineAd(string uniqueId, string streamM3u8, string sig, string token, bool first)
{ {
string[] lines = streamM3u8.Split('\n'); string[] lines = streamM3u8.Split('\n');
for (int i = 0; i < lines.Length; i++) for (int i = 0; i < lines.Length; i++)
@ -398,11 +407,23 @@ namespace TwitchAdUtils
Dictionary<string, string> attr = ParseAttributes(lines[i]); Dictionary<string, string> attr = ParseAttributes(lines[i]);
Dictionary<string, string> vals = new Dictionary<string, string>(); Dictionary<string, string> vals = new Dictionary<string, string>();
vals["TARG_adSessionID"] = GetOrDefault(attr, "X-TV-TWITCH-AD-AD-SESSION-ID"); vals["TARG_adSessionID"] = GetOrDefault(attr, "X-TV-TWITCH-AD-AD-SESSION-ID");
string str = @"[{""operationName"":""VideoAdRequestDecline"",""variables"":{""context"":{""adSessionID"":""TARG_adSessionID"",""clientContext"":""{\""isAudioOnly\"":false,\""isMiniTheater\"":false,\""isPIP\"":true,\""isUsingExternalPlayback\"":false}"",""isAudioOnly"":false,""isMiniTheater"":false,""isPIP"":false,""isUsingExternalPlayback"":false,""duration"":30,""isVLM"":false,""rollType"":""PREROLL""}},""extensions"":{""persistedQuery"":{""version"":1,""sha256Hash"":""XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX""}}}]"; vals["TARG_sig"] = sig;
vals["TARG_token"] = token.Replace("\"", "\\\"");
string str = null;
//string str = @"[{""operationName"":""VideoAdRequestDecline"",""variables"":{""context"":{""adSessionID"":""TARG_adSessionID"",""clientContext"":""{\""isAudioOnly\"":false,\""isMiniTheater\"":false,\""isPIP\"":true,\""isUsingExternalPlayback\"":false}"",""isAudioOnly"":false,""isMiniTheater"":false,""isPIP"":false,""isUsingExternalPlayback"":false,""duration"":30,""isVLM"":false,""rollType"":""PREROLL""}},""extensions"":{""persistedQuery"":{""version"":1,""sha256Hash"":""6f5d9fdc36a3c879cca7debdbe21c62d5cac4ad5b30b635263eff68335b96a71""}}}]";
if (first)
str = @"[{""operationName"":""VideoAdRequestDecline"",""variables"":{""context"":{""adSessionID"":""TARG_adSessionID"",""clientContext"":{""isAudioOnly"":false,""isMiniTheater"":false,""isPIP"":false,""isUsingExternalPlayback"":false},""duration"":30,""playerContext"":{""contentType"":""LIVE"",""isAutoPlay"":true,""nauthSig"":""TARG_sig"",""nauthToken"":""TARG_token""},""rollType"":""PREROLL"",""isVLM"":false,""commercialID"":""""}},""extensions"":{""persistedQuery"":{""version"":1,""sha256Hash"":""6f5d9fdc36a3c879cca7debdbe21c62d5cac4ad5b30b635263eff68335b96a71""}}}]";
else
{
vals["TARG_ad_session_id"] = GetOrDefault(attr, "X-TV-TWITCH-AD-AD-SESSION-ID");
vals["TARG_radToken"] = GetOrDefault(attr, "X-TV-TWITCH-AD-RADS-TOKEN");
str = @"[{""operationName"":""ClientSideAdEventHandling_RecordAdEvent"",""variables"":{""input"":{""eventName"":""video_ad_request_declined"",""eventPayload"":""{\""reason_channeladfree\"":false,\""reason_channelsub\"":false,\""reason_vod_ads_disabled\"":false,\""reason_bounty\"":false,\""reason_vod_midroll\"":false,\""reason_stream_broadcaster\"":false,\""reason_embed_promo\"":false,\""reason_p4m\"":false,\""reason_lt\"":false,\""reason_raid\"":false,\""reason_midroll_during_preroll\"":false,\""reason_ratelimit\"":false,\""reason_short_vod\"":false,\""reason_turbo\"":false,\""reason_vod_creator\"":false,\""reason_wp\"":false,\""reason_zagd\"":false,\""reason_zagu\"":false,\""reason_midlimit\"":false,\""reason_amazon_product_page\"":false,\""reason_animated_thumbnails\"":false,\""reason_creative_player\"":false,\""reason_dashboard\"":false,\""reason_facebook\"":false,\""reason_frontpage\"":false,\""reason_highlighter\"":false,\""reason_onboarding\"":false,\""reason_pbyp\"":false,\""reason_squad_stream_secondary_player\"":false,\""reason_thunderdome\"":true,\""reason_embed\"":false,\""twitch_correlator\"":\""\"",\""ad_session_id\"":\""TARG_ad_session_id\"",\""roll_type\"":\""preroll\"",\""time_break\"":30}"",""radToken"":""TARG_radToken""}},""extensions"":{""persistedQuery"":{""version"":1,""sha256Hash"":""7e6c69e6eb59f8ccb97ab73686f3d8b7d85a72a0298745ccd8bfc68e4054ca5b""}}}]";
}
foreach (KeyValuePair<string, string> val in vals) foreach (KeyValuePair<string, string> val in vals)
{ {
str = str.Replace(val.Key, val.Value); str = str.Replace(val.Key, val.Value);
} }
//Console.WriteLine(str);
using (WebClient wc = new WebClient()) using (WebClient wc = new WebClient())
{ {
wc.Proxy = null; wc.Proxy = null;