Hotfix for AdBlock and ABP

This commit is contained in:
Imre Kristoffer Eilertsen
2020-07-25 07:43:13 +02:00
committed by GitHub
parent afa22eec37
commit ec5f433974
4 changed files with 21 additions and 6 deletions
@@ -1175,7 +1175,7 @@ viafree.no,viafree.dk##.pause-ad-container
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
@@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
/insert_grtv_stats.$xmlhttprequest,app=com.gamereactor
! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent.
! 🇬🇧: Entries for far-right websites. Support for these sites is limited, and most new entries that are suggested for them will be accepted verbatim.
@@ -1176,7 +1176,7 @@ viafree.no,viafree.dk##.pause-ad-container
||freewheel-mtgx-tv.akamaized.net^$media,domain=viafree.no|viafree.dk
@@||fwmrm.net/ad/$image,xmlhttprequest,domain=viafree.no|viafree.dk
@@||fwmrm.net/crossdomain.xml$xmlhttprequest,domain=viafree.no|viafree.dk
/insert_grtv_stats.$xmlhttprequest,app=com.gamereactor
! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent.
! 🇬🇧: Entries for far-right websites. Support for these sites is limited, and most new entries that are suggested for them will be accepted verbatim.
@@ -436,10 +436,7 @@ gamereactor.*##+js(nano-stb)
@@||fwmrm.net/ad/$image,xhr,domain=viafree.no|viafree.dk
@@||fwmrm.net/crossdomain.xml$xhr,domain=viafree.no|viafree.dk
!#if !ext_ublock
/adblock_mobile.$important,app=com.gamereactor
/insert_grtv_stats.$xhr,app=com.gamereactor
/prerolls/*$app=com.gamereactor
/viewability.$important,app=com.gamereactor
@@||openx.gamereactor.dk/www/delivery/fc.php$app=com.gamereactor
!#endif
! 🇳🇴: Oppføringer for ytre-høyre-nettsteder. Støtte for disse nettstedene er begrenset, og de fleste nye oppføringer som blir foreslått for dem vil bli ordrett godkjent.
@@ -608,6 +608,12 @@ def prepare_abp(lines) -> str:
line
)
line = re.sub(
r".*\$.*,app=.*",
r"",
line
)
if is_supported_abp(line):
text += line + '\r\n'
@@ -1325,6 +1331,12 @@ def prepare_brave(lines) -> str:
line
)
line = re.sub(
r".*\$.*,app=.*",
r"",
line
)
if is_supported_brave(line) and not line == '':
text += line + '\r\n'
@@ -1829,6 +1841,12 @@ def prepare_abp(lines) -> str:
line
)
line = re.sub(
r".*\$.*,app=.*",
r"",
line
)
if is_supported_abp(line):
text += line + '\r\n'
@@ -1848,7 +1866,7 @@ if __name__ == "__main__":
with open(OUTPUT_ABP, "w") as text_file:
text_file.write(abp_filter)
print('The Eyeo and AdGuard list versions have been generated.')
print('The Eyeo list version has been generated.')