From 8b456d8ad0bce62bbb729fa6fa08cd412efeb762 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 24 May 2023 10:20:25 +0200 Subject: [PATCH] Fix #151706 10play.com.au --- BaseFilter/sections/allowlist.txt | 3 +++ BaseFilter/sections/general_extensions.txt | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/BaseFilter/sections/allowlist.txt b/BaseFilter/sections/allowlist.txt index a41d6c8ea2c..555cd6f01bd 100644 --- a/BaseFilter/sections/allowlist.txt +++ b/BaseFilter/sections/allowlist.txt @@ -1950,6 +1950,9 @@ kzstock.blogspot.com#@##ad-target @@||kimcartoon.to/Scripts^ ! https://github.com/AdguardTeam/AdguardFilters/issues/48162 @@||stream2watch.ws/js/app.js +! https://github.com/AdguardTeam/AdguardFilters/issues/151706 +!+ NOT_PLATFORM(windows, mac, android, ext_chromium) +@@||googlevideo.com/videoplayback/*dclk_video_ads$domain=10play.com.au ! https://github.com/AdguardTeam/AdguardFilters/issues/146902 @@||securepubads.g.doubleclick.net/tag/js/gpt.js$domain=10play.com.au @@||securepubads.g.doubleclick.net/gpt/pubads_impl_*.js$domain=10play.com.au diff --git a/BaseFilter/sections/general_extensions.txt b/BaseFilter/sections/general_extensions.txt index c1dd9c3d617..400bb64935f 100644 --- a/BaseFilter/sections/general_extensions.txt +++ b/BaseFilter/sections/general_extensions.txt @@ -344,9 +344,9 @@ greatandhra.com#%#//scriptlet('set-cookie-reload', 'sosh', 'true') guccihide.com#%#//scriptlet("abort-current-inline-script", "eval", "String.fromCharCode") ! https://github.com/AdguardTeam/AdguardFilters/issues/146902 ! TODO: replace JS rule by m3u-prune scriptlet when it will be available -! 10play.com.au#%#//scriptlet('m3u-prune', '/redirector\.googlevideo\.com\/videoplayback\?[\s\S]*?&source=dclk_video_ads/', 'pubads.g.doubleclick.net/ondemand/hls/') -10play.com.au#%#(()=>{window.XMLHttpRequest.prototype.open=new Proxy(window.XMLHttpRequest.prototype.open,{apply:async(a,b,c)=>{const d=c[1];return"string"!=typeof d||0===d.length?Reflect.apply(a,b,c):(d.match(/pubads\.g\.doubleclick.net\/ondemand\/hls\/.*\.m3u8/)&&b.addEventListener("readystatechange",function(){if(4===b.readyState){const a=b.response;Object.defineProperty(b,"response",{writable:!0}),Object.defineProperty(b,"responseText",{writable:!0});const c=a.replaceAll(/#EXTINF:(\d|\d\.\d+)\,\nhttps:\/\/redirector\.googlevideo\.com\/videoplayback\?[\s\S]*?&source=dclk_video_ads&[\s\S]*?\n/g,"");b.response=c,b.responseText=c}}),Reflect.apply(a,b,c))}})})(); -||pubads.g.doubleclick.net/ondemand/hls/content/*/streams/*.m3u8$hls=\/videoplayback^?*&source=dclk_video_ads,domain=10play.com.au +! 10play.com.au#%#//scriptlet('m3u-prune', '/redirector\.googlevideo\.com\/videoplayback\?[\s\S]*?dclk_video_ads/', 'pubads.g.doubleclick.net/ondemand/hls/') +10play.com.au#%#!function(e="",t="",r=""){const s=(e,t,r,s,n)=>({method:e,url:t,async:r,user:s,password:n}),n=e=>{const t={};return Object.keys(e).forEach((r=>{t[r]=((e="")=>{if(""===e)return new RegExp(".?");if("/"===e[0]&&"/"===e[e.length-1])return new RegExp(e.slice(1,-1));const t=e.replace(/\\'/g,"'").replace(/\\"/g,'"').replace(/[.*+?^${}()|[\]\\]/g,"\\$&");return new RegExp(t)})(e[r])})),t},o=e=>Object.values(e).every((e=>(e=>{let t,r=(e=>e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"))(e);"/"===e[0]&&"/"===e[e.length-1]&&(r=e.slice(1,-1));try{t=new RegExp(r),t=!0}catch(e){t=!1}return t})(e))),a=window.XMLHttpRequest.prototype.open,l=window.XMLHttpRequest.prototype.send;let c;const p={apply:(e,t,a)=>{if(c=s.apply(null,a),((e,t)=>{if(""===e||"*"===e)return!0;let r;const s=(e=>{const t=["url","method","headers","body","mode","credentials","cache","redirect","referrer","referrerPolicy","integrity","keepalive","signal"],r={};return e.split(" ").forEach((e=>{const s=e.indexOf(":"),n=e.slice(0,s);if(t.includes(n)){const t=e.slice(s+1);r[n]=t}else r.url=e})),r})(e);if(o(s)){const e=n(s);r=Object.keys(e).every((r=>{const s=e[r];return Object.prototype.hasOwnProperty.call(t,r)&&s.test(t[r])}))}else console.debug(`Invalid parameter: ${e}`),r=!1;return r})(r,c)&&(t.shouldBePrevented=!0),t.shouldBePrevented){t.collectedHeaders=[];const e=(e,t,r)=>(t.collectedHeaders.push(r),Reflect.apply(e,t,r)),r={apply:e};t.setRequestHeader=new Proxy(t.setRequestHeader,r)}return Reflect.apply(e,t,a)}},d={apply:(e,r,s)=>{if(!r.shouldBePrevented)return Reflect.apply(e,r,s);const n=new XMLHttpRequest;n.addEventListener("readystatechange",(()=>{if(4!==n.readyState)return;const{readyState:e,response:s,responseText:o,responseURL:a,responseXML:l,status:c,statusText:p}=n,d=o||s;if("string"!=typeof d)return;const i=d.replaceAll(/#EXTINF:(\d|\d\.\d+)\,\nhttps:\/\/redirector\.googlevideo\.com\/videoplayback[\s\S]*?dclk_video_ads[\s\S]*?\n/g,t);Object.defineProperties(r,{readyState:{value:e,writable:!1},responseURL:{value:a,writable:!1},responseXML:{value:l,writable:!1},status:{value:c,writable:!1},statusText:{value:p,writable:!1},response:{value:i,writable:!1},responseText:{value:i,writable:!1}}),setTimeout((()=>{const e=new Event("readystatechange");r.dispatchEvent(e);const t=new Event("load");r.dispatchEvent(t);const s=new Event("loadend");r.dispatchEvent(s)}),1)})),a.apply(n,[c.method,c.url]),r.collectedHeaders.forEach((e=>{const t=e[0],r=e[1];n.setRequestHeader(t,r)})),r.collectedHeaders=[];try{l.call(n,s)}catch{return Reflect.apply(e,r,s)}}};XMLHttpRequest.prototype.open=new Proxy(XMLHttpRequest.prototype.open,p),XMLHttpRequest.prototype.send=new Proxy(XMLHttpRequest.prototype.send,d)}("#EXTINF:(\d|\d\.\d+)\,\nhttps:\/\/redirector\.googlevideo\.com\/videoplayback[\s\S]*?dclk_video_ads[\s\S]*?\n","",".m3u8"); +||pubads.g.doubleclick.net/ondemand/hls/*.m3u8$hls=/redirector\.googlevideo\.com\/videoplayback[\s\S]*?dclk_video_ads/,domain=10play.com.au ! https://github.com/AdguardTeam/AdguardFilters/issues/146786 asianage.com#%#AG_onLoad(() => { var element = document.querySelector('.rightCol'); if ( element ) { element.innerHTML = element.innerHTML.replaceAll('ADVERTISEMENT', ''); } }); ! https://github.com/AdguardTeam/AdguardFilters/issues/146542