From 88e9f6b4dfba2b258698d796bcbc8ef3892b4d98 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Fri, 9 Dec 2022 17:35:36 +0100 Subject: [PATCH] Add files via upload Update 5/10 to qualify for AdGuard Hostlists Registry. --- AdGuard Home Compilation List/AGHtest.py | 12 ++ ...GuardHomeCompilationList-Notifications.txt | 14 +- .../AdGuardHomeCompilationList.txt | 193 ++++++------------ .../AdGuardHomeCompilationListIPs.txt | 2 +- 4 files changed, 84 insertions(+), 137 deletions(-) diff --git a/AdGuard Home Compilation List/AGHtest.py b/AdGuard Home Compilation List/AGHtest.py index 8a7a14508..62fab0aa1 100644 --- a/AdGuard Home Compilation List/AGHtest.py +++ b/AdGuard Home Compilation List/AGHtest.py @@ -926,6 +926,18 @@ def prepare_agh(lines) -> str: line ) + line = re.sub( + r"^\$.*", + r"", + line + ) + + line = re.sub( + r".*Reek's Anti-Adblock Killer.*", + r"", + line + ) + if is_supported_agh(line) and not line == '': text += line + '\r\n' diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt index a06416546..5124b9a8c 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList-Notifications.txt @@ -1,15 +1,16 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List - Web Push Notifications ! Contains modified entries from: Fanboy's Notifications Blocking List, and AdGuard Annoyances Web Push -! Version: 08December2022v2-Beta +! Version: 09December2022v1-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, AdGuard Annoyances Web Push's contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), while Fanboy's Notifications Blocking List whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are Ryan Brown (Fanboy's Notifications Blocking List) and AdGuard Software Limited (AdGuard Annoyances Web Push). ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule, which makes various major lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. ! —————————————————————————————————————————————— -! Version: 202212081931 +! Version: 202212091521 ! Title: Fanboy's Notifications Blocking List -! Last modified: 08 Dec 2022 19:31 UTC +! Last modified: 09 Dec 2022 15:21 UTC ! License: http://creativecommons.org/licenses/by/3.0/ +! Please report any unblocked content or problems by email or in our forums ! Email: easylist@protonmail.com ! Homepage: https://easylist.to/ ! Forums: https://forums.lanik.us/ @@ -63,8 +64,12 @@ /webPushIframe. /webPushNotifications. /wonderpush. +! Mobile notifications !------------------------General element hiding rules-------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_general_hide.txt *** +! Mobile Notifications +! spot.im Notifications +! International !-------------------------Third-party blocking rules--------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_thirdparty.txt *** ||api-push.com^ @@ -106,6 +111,7 @@ ||push.getbeamer.com^ ||push.knd.ro^ ||push.newscraft.io^ +||push.reamaze.com^ ||push.rent^ ||push.rollout.io^ ||push.world^ @@ -249,10 +255,12 @@ ||push.neko-san.fr^ !------------------------Specific element hiding rules------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_specific_hide.txt *** +! Mobile app Notifications !---------------------------------Allowlists----------------------------------! ! *** easylist:fanboy-addon/fanboy_notifications_allowlist_general_hide.txt *** ! *** easylist:fanboy-addon/fanboy_notifications_allowlist.txt *** ! Title: AdGuard Popups filter - Push notifications, specific +! This section contains the list of generic rules that block website push notifications ("subscribe to the news" kind of notifications). ! Good: any type of the rules will be good ! SECTION: Push notifications - Generic rules .vafrike.ru^ diff --git a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt index 2d0576801..81c611a4a 100644 --- a/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt +++ b/AdGuard Home Compilation List/AdGuardHomeCompilationList.txt @@ -1,6 +1,6 @@ [Adblock Plus 3.4] ! Title: Dandelion Sprout's AdGuard Home Compilation List -! Version: 08December2022v2-Beta +! Version: 09December2022v1-Beta ! Expires: 14 days ! Licence: In accordance with the Dandelicence, all of the borrowed lists' contents are to be treated as GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html), except for Liste FR's and Liste AR's entries which are to be treated as CC BY-NC-SA 3.0 (https://creativecommons.org/licenses/by-nc-sa/3.0/), and RU AdList whose loose CC BY 3.0 seems to me to enable me to relicence them under the Dandelicence. Known credits in accordance with attribution requirements, are The EasyList Authors (EasyList^³, Adblock Warning Removal List), Raymond Hill (uBlock Filters^²), AdGuard Software Limited (AdGuard Base Filter, AdGuard French Filter), smed79 (Liste AR), Daniel Kladnik (I Don't Care About Cookies), monztA & friends (ABP Filters), and Lain13 & Dimisa (RU AdList). ! Description: AdGuard Home is one of the tools for the future, or at least it is for those who know how to set up and use a Raspberry Pi. However, its current internal structure discards virtually every $-using block rule (e.g. EasyList), which makes EasyList and similar lists virtually useless in AdGuard Home, despite how many of the entries would be ≥90% as functional without them. So until the AdGuard Home team implements a better way to deal with $ values, here's my intermissional list to work around it. @@ -13,9 +13,9 @@ ! To seemingly unbreak Nintendo Switch online games @@||104.198.251.169 ! ———————————————————————————————————— -! Version: 202212081931 +! Version: 202212091521 ! Title: EasyList without element hiding rules -! Last modified: 08 Dec 2022 19:31 UTC +! Last modified: 09 Dec 2022 15:21 UTC ! Homepage: https://easylist.to/ ! Licence: https://easylist.to/pages/licence.html ! in the forums (https://forums.lanik.us/) @@ -1611,10 +1611,12 @@ ||19528681.com^ ||19805d2bcb.com^ ||19bk5lo5q2.com^ +||1aa3097b7b.com^ ||1b14e0ee42d5e195c9aa1a2f5b42c710.com^ ||1c09d36b99.com^ ||1c204c05d2898056fd.com^ ||1c2e32f165.com^ +||1ca47a451d.com^ ||1ccbt.com^ ||1d354c1645.com^ ||1da19a918c.com^ @@ -1731,6 +1733,7 @@ ||2jmis11eq.de^ ||2jod3cl3j.de^ ||2llmonds4ehcr93nb.com^ +||2lqcd8s9.de^ ||2lwlh385os.com^ ||2m3gdt0gc.de^ ||2m55gqleg.de^ @@ -2033,6 +2036,7 @@ ||754999acdc.com^ ||75abf77682.com^ ||75f7e171e0.com^ +||7676f1cc6c.com^ ||76a7doiet256.com^ ||76b9011198.com^ ||76d1f732d1.com^ @@ -2468,6 +2472,7 @@ ||adbutler.com^ ||adbuyer.com^ ||adcannyxml.com^ +||adcash.com^ ||adcastplus.net^ ||adcde.com^ ||adcdnx.com^ @@ -3124,6 +3129,7 @@ ||aj2397.online^ ||aj2430.online^ ||aj2495.online^ +||aj2526.bid^ ||ajaltoly.com^ ||ajdgssgxsesg.xyz^ ||ajeebgbt.top^ @@ -4577,6 +4583,7 @@ ||berhima.xyz^ ||berkshiretoday.xyz^ ||berlipurplin.com^ +||bermpnrtcuwls.com^ ||berthsorry.com^ ||berush.com^ ||besequda.xyz^ @@ -4659,6 +4666,7 @@ ||beturtwiga.com^ ||betxerneastor.club^ ||betzapdoson.com^ +||beunblkd.xyz^ ||beveledcorkir.com^ ||bewailconsistedmembers.com^ ||bewailindigestionunhappy.com^ @@ -5179,6 +5187,7 @@ ||bttrack.com^ ||btvhdscr.com^ ||btwasinlovewit.xyz^ +||btwwiwmhfhh.com^ ||btxxxnav.com^ ||bu3le2lp4t45e6i.com^ ||bubblyalibiappear.com^ @@ -5524,6 +5533,7 @@ ||cehuiy.com^ ||ceileangsts.com^ ||celeb-ads.com^ +||celebritybulk.com^ ||celebsreflect.com^ ||celeritascdn.com^ ||celign.com^ @@ -5714,6 +5724,7 @@ ||chosesleptcattish.com^ ||chottsapocha.com^ ||chouftak.net^ +||choupaig.xyz^ ||choupsee.com^ ||chpok.pw^ ||chrantary-vocking.com^ @@ -5737,6 +5748,7 @@ ||chyxaxegre.com^ ||chyxyrothi.com^ ||cialanaly.club^ +||cicelysewans.com^ ||cictivesmuha.xyz^ ||cidbulmkwtaxe.xyz^ ||cifaumsy.net^ @@ -6026,6 +6038,7 @@ ||coltseaman.com^ ||coluim.com^ ||columnisterror.com^ +||columnsremembrancesoap.com^ ||coluth.com^ ||com-wkejf32ljd23409system.net^ ||comadscity.com^ @@ -6231,6 +6244,7 @@ ||couplergavot.casa^ ||coupsonu.net^ ||couptoug.net^ +||courageous-lead.pro^ ||courierregistered.com^ ||couriersticky.com^ ||courteous-development.com^ @@ -6550,6 +6564,7 @@ ||danzhallfes.com^ ||daphnews.com^ ||dapper.net^ +||daqhdxacckufkwv.com^ ||daredstrapelinor.com^ ||darersan.co^ ||darghinruskin.com^ @@ -7217,6 +7232,7 @@ ||dukirliaon.com^ ||dulcormutated.com^ ||dulillipupan.com^ +||dulojet.com^ ||dulombwwfm.com^ ||dumbclerkwow.com^ ||dumbpop.com^ @@ -7423,6 +7439,7 @@ ||edstever.com^ ||edstrastco.com^ ||edstylistepro.xyz^ +||edtaojhaavnt.com^ ||edua29146y.com^ ||educationaldetachblob.com^ ||educedsteeped.com^ @@ -7633,6 +7650,7 @@ ||enlightenedinterest.pro^ ||enlnks.com^ ||enmassstraits.com^ +||enmekedwahin.com^ ||enmvnowpx.com^ ||enodiarahnthedon.com^ ||enoughts.info^ @@ -8518,6 +8536,7 @@ ||futureus.com^ ||fuxoasim.link^ ||fuzeelamby.com^ +||fvcwqkkqmuv.com^ ||fwbntw.com^ ||fwgvpvdgwby.com^ ||fwmrm.net^ @@ -8553,6 +8572,7 @@ ||gadspmz.com^ ||gagacon.com^ ||gagaribber.casa^ +||gaghxppirqo.com^ ||gaghygienetheir.com^ ||gagpetwet.com^ ||gaietyastonished.com^ @@ -9207,6 +9227,7 @@ ||gypsiedjilt.com^ ||gypsyardently.com^ ||gytychuna.com^ +||gyzqswxly.com^ ||gyzyphepsu.pro^ ||gzlmknzeifjfyp.com^ ||h12-media.com^ @@ -10125,6 +10146,7 @@ ||ipsowrite.com^ ||iptautup.com^ ||iqbkkhhsgk.com^ +||iqqxhgekch.xyz^ ||iqtest365.online^ ||iqzgqivb.com^ ||irardijjyawmool.xyz^ @@ -10138,6 +10160,7 @@ ||iringtgandm.one^ ||irinto.com^ ||iroble.com^ +||ironcladmemory.pro^ ||ironerrooser.com^ ||ironerswhse.digital^ ||ironicfolks.com^ @@ -10293,6 +10316,7 @@ ||jchgcipyywszqt.com^ ||jcrlrwwosud.xyz^ ||jcyunk2.com^ +||jderchgfoi.com^ ||jdmsdyuoltpgby.xyz^ ||jdoqocy.com^ ||jdufvnoytl.com^ @@ -11128,6 +11152,7 @@ ||liliy9aydje10.com^ ||lilureem.com^ ||limberkilnman.cam^ +||limeclassycaption.com^ ||limelightcopper.com^ ||limelightdecent.com^ ||limevisitedinaugurate.com^ @@ -11183,6 +11208,7 @@ ||livetellsspatter.com^ ||liveunderestimate.com^ ||livezombymil.com^ +||lividtrash.pro^ ||livorbarbes.com^ ||lizivaje.xyz^ ||ljrshdrbbmwae.xyz^ @@ -11331,6 +11357,7 @@ ||lplimjxiyx.com^ ||lqcdn.com^ ||lqgbqafvfga.xyz^ +||lqubvnyhuk.com^ ||lqw.me^ ||lr-in.com^ ||lrhahgsiqustw.xyz^ @@ -12779,6 +12806,7 @@ ||obnarium.com^ ||obnoxiousstackderide.com^ ||obscus.com^ +||obsers.com^ ||observativus.com^ ||obsessionthree.com^ ||obsessivepetsbean.com^ @@ -12954,6 +12982,7 @@ ||onastydrum.com^ ||onaugan.com^ ||onautcatholi.xyz^ +||onbimcjvlvfjj.com^ ||oncertaino.xyz^ ||onclarck.com^ ||onclasrv.com^ @@ -13406,6 +13435,7 @@ ||parkingridiculous.com^ ||parkurl.com^ ||parlinggodded.com^ +||parolropmo.com^ ||paroup.com^ ||parrecleftne.com^ ||parringepigene.com^ @@ -14643,6 +14673,7 @@ ||raglogripsa.com^ ||raicabuy.net^ ||raigluce.net^ +||raigns.com^ ||railroadfatherenlargement.com^ ||railroadtomato.com^ ||rainbending.com^ @@ -14652,6 +14683,8 @@ ||raisedmanatee.com^ ||rajabets.xyz^ ||rakamu.com^ +||rakhukarc.com^ +||rallydisprove.com^ ||rallynabdoomed.com^ ||ralphabnegation.com^ ||rammishruinous.com^ @@ -14768,6 +14801,7 @@ ||rechampouinerai.website^ ||rechaptalisent.xyz^ ||reciar.com^ +||recids.com^ ||recipesunny.com^ ||reciprocaldandy.com^ ||reckinbuttiten.pro^ @@ -14997,6 +15031,8 @@ ||retargetcore.com^ ||retargeter.com^ ||retauwhu.com^ +||retentrhason.com^ +||rethowilmari.com^ ||retiringvarieties.com^ ||retono42.us^ ||retoxo.com^ @@ -15180,6 +15216,7 @@ ||robovoiz.com^ ||robsardri.com^ ||robsbogsrouse.com^ +||robsedgeone.com^ ||robsoaks.com^ ||robspabah.com^ ||robustcutlery.com^ @@ -15689,6 +15726,7 @@ ||separatecolonist.com^ ||separationreverttap.com^ ||separenujilo.club^ +||separine.com^ ||sepknotting.xyz^ ||septfd2em64eber.com^ ||sequelswosbird.com^ @@ -15944,6 +15982,7 @@ ||sipibowartern.com^ ||sippansy.com^ ||siredonlacs.com^ +||sirepisode.com^ ||sireundermineoperative.com^ ||sisewepod.com^ ||sitdoobly.com^ @@ -17119,6 +17158,7 @@ ||tivetrainin.one^ ||tiwhaiph.net^ ||tjgasbjinlx.xyz^ +||tjhpsylyxdfov.xyz^ ||tjhtclwubg.xyz^ ||tjisenap.com^ ||tkbo.com^ @@ -18611,6 +18651,7 @@ ||wirratailage.com^ ||wirsauco.com^ ||wisehowronspar.com^ +||wishesantennarightfully.com^ ||wishjus.com^ ||wistfulcomet.com^ ||wistot.com^ @@ -18624,6 +18665,7 @@ ||withoutmotivation.com^ ||witlingdandie.com^ ||witnessfeast.com^ +||wittf.com^ ||wittilyfrogleg.com^ ||wivesdandyemulation.com^ ||wizardmarndl.com^ @@ -18749,6 +18791,7 @@ ||wrkl.xyz^ ||wrotos.com^ ||wrygraphicstheme.com^ +||wsgbfgtjxv.com^ ||wsidfmckbwmlwao.xyz^ ||wsjlbbqemr23.com^ ||wslqgslkuv.com^ @@ -19439,7 +19482,6 @@ ||adbetnet.com^ ||adbit.biz^ ||adcalm.com^ -||adcash.com^ ||adcell.com^ ||adclickafrica.com^ ||adcolony.com^ @@ -23023,7 +23065,6 @@ ! streamplay ||centent.streamp1ay. ||cintent.streanplay. -! Specific filters necessary for sites allowlisted with $genericblock filter option ! *** easylist:easylist/easylist_specific_block_popup.txt *** ||link.advancedsystemrepairpro.com^ ||player.tabooporns.com^ @@ -23187,7 +23228,6 @@ ! bad*.it network sites ||ocwagmlizb.com^ ||ebd.cda-hd.cc^ -! palimas tv => palimas org ! AdFly ||fbs.com^ ||yoads.network^ @@ -23337,7 +23377,6 @@ ||popcent.org^ ! pch .com ||eecain7z.com^ -! vidmoly . me | .to popups ! 01torrent . net popups ||romgoc.net^ @@||dlnowsoft.com^ @@ -23481,7 +23520,6 @@ ||ads.adrise.tv^ ! fix seireshd.com anti adb ||adsrt.com^ -! fix pivigames.blog ads & popup ! thecrazytourist .com popunder ||megatube.xxx^ @@||gelbeseiten.de^ @@ -23491,7 +23529,6 @@ ||hitadsmedia.com^ ||affforce.com^ ||opositeass.com^ -! serialy.bombuj.tv | .si anti adb ! automobile-propre.com anti adb ||ekdj30.com^ ! Workaround for https://github.com/uBlockOrigin/uAssets/issues/8319 @@ -23539,7 +23576,6 @@ ||ad.kisstvshow. ! winit.heatworld.com anti adb ||bitcoinadvertise.net^ -! gfsvideos .com exo + popups ! dpstream .bz popups ||d2wpknqle9nuv8.cloudfront.net^ ! freesoftpdfdownload.blogspot.com anti adb popups @@ -23553,6 +23589,7 @@ @@||mangalist.org^ ! books-share.com anti adb @@||onlystream.tv^ +! theshedend.com anti adb ! canalplus.com anti adb + ads ||vidads.gr^ ! indaily.com.au anti adb @@ -23610,8 +23647,6 @@ ||pixsense.net^ ! cryptofuns.ru anti-adb ||aii.sh^ -! perfectmomsporn .com ads + popunder -! tubexxxone .com ads + popunder ! theregister.co.uk ||showyourresult.com^ ! btdb .eu popunder @@ -23682,10 +23717,6 @@ ||clk.sh^ ||giftcardbouns.com^ ||toolss.net^ -! reallifecam .vip anti adb + popups -! hdmovie8 .com => sexhd .co popups -! scrubson. blogspot.com anti adb + popups -! nsfw aquariumgays .com anti adb + popups ! redecanais.bz ads ||autofaucets.org^ ! khmer7.org anti-adb @@ -23693,8 +23724,6 @@ ! nsfw thisav .com popups ||antirgiocub.com^ ||bwtsrv.com^ -! thememazing .com broken page + other anti adb -! fix mdpDeBlocker + some other anti-adb ! new filters from april 2020 to -> ||7mb.nl^ ! art sites redirections, ads @@ -23720,6 +23749,7 @@ ||fzj3v7sch2xg5gosh60vpkrth5c6cngvj5ivd9kg5ajcdl2vlp2ocj5fjbto.me^ ! twistedporn .com popup @@||burzowo.info^ +! freenote .biz anti adb ! lagacetadesalamanca.es video ads ||nirostyhe.pro^ ! other exoclick crap https://github.com/uBlockOrigin/uAssets/issues/6151#issuecomment-629804631 @@ -23727,7 +23757,6 @@ ||sexoland.net^ ! supergoku.com popup ||cuttlefly.com^ -! brstej .com ads + popups ! ads, popups ||adsgig.com^ ! movies07. art / .live anti adb @@ -23760,7 +23789,6 @@ ||webpushr.com^ ! moneycontrol.com ad interstitial ||uii.io^ -! venusarchives .com popups + anti adb ! bejav.net popup on playing video ||js.mangapro.top^ ||abc.comick.top^ @@ -23781,7 +23809,6 @@ ||moremoney.io^ @@||softairbay.com^ ! bfstrms .xyz https://github.com/uBlockOrigin/uAssets/commit/f35dd2a06aa8b940ba58b0a4644cae44ef6fba35#commitcomment-42272213 -! crackstreams. online console debugger freeze & popups on click ! readm.org ads ||0zz0.com^ ! brave issue google funding @@ -23812,14 +23839,12 @@ ! wetpussy.sexy popunder, ads ||htagpa.tech^ ||aghtag.tech^ -! babeporn .net popunder => .org ! cuturl.in anti adb ads ||vadspremium.com^ ! popups https://elitegoltv. es/canal-1.php ! nsfwmonster.com popup ||bitlk.com^ ! popups, devtools detection https://moviessources .cf/embed/38700 -! kaomoji-cafe.web.app -> akuu-sflin.blogspot.com anti-adb & PH ! hd21 group sites ||zusepe.xyz^ ! cryptofun .space anti adb @@ -24606,18 +24631,21 @@ ||oolomos.com^ ! Title: AdGuard Base filter ! Description: This filter is necessary for quality ad blocking. -! Version: 2.2.58.89 -! TimeUpdated: 2022-12-08T18:31:38+00:00 +! Version: 2.2.59.3 +! TimeUpdated: 2022-12-09T15:31:37+00:00 ! Homepage: https://github.com/AdguardTeam/AdGuardFilters ! License: https://github.com/AdguardTeam/AdguardFilters/blob/master/LICENSE ! Examples: AG_removeCookie('/REGEX/') or AG_removeCookie('part of the cookie name') ! See https://github.com/AdguardTeam/deep-override ! Based on AG_defineProperty (https://github.com/AdguardTeam/deep-override) ! Examples: -! AND content of the