Merge pull request #22328 from hawkeye116477/gh-pages

Add new filterlists

website/assets/scss/_variables_project.scss

@@ -122,6 +122,14 @@ table {
     background-image: url("../images/ABP_32.png")
 }
 
+.Dmq-icon {
+    background-image: url("../images/Dnsmasq.svg")
+}
+
+.FG-icon {
+    background-image: url("../images/FTNT.svg");
+}
+
 .uBO-icon {
     background-image: url("../images/uBO_32.png")
 }
@@ -154,7 +162,6 @@ table {
     background-image: url("../images/pfBlockerNG.jpg")
 }
 
-
 .AGHome-icon {
     background-image: url("../images/AGHome.svg")
 }
@@ -191,6 +198,7 @@ table {
     content: "\00a0";
 }
 .icon-dropdown {
+    background-position: center center;
     background-size: contain;
     background-repeat: no-repeat;
     position: relative;

website/content/pl/table_notes.md

@@ -1,4 +1,4 @@
-`*` Jeżeli masz rozszerzenie **I don't care about cookies**, to nie musisz subskrybować listy o tej samej nazwie, ponieważ filtry **I don't care about cookies** znajdują się juz w tym dodatku.
+`*` W przypadku uBO jest dostępny zestaw 2 list pod nazwą EasyList/uBO – Cookie Notices, który zalecamy zaznaczyć.
 
 `**` Jeżeli korzystasz z **Polskich Filtrów Elementów Irytujących**, to nie dodawaj listy **RODO-Ciasteczkowej**, ponieważ **Filtry RODO-Ciasteczkowe** znajdują się już w **Filtrach Elementów Irytujących**.
 

website/data/FilterLists.toml

@@ -37,8 +37,8 @@ subscribe = "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/
 issues = "https://github.com/MajkiIT/polish-ads-filter/issues"
 mail = "[email protected]"
 home = "https://www.certyficate.it/"
-requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://www.i-dont-care-about-cookies.eu/abp/, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it"
-requiredTitle = "EasyList, Polskie Filtry, I don't care about cookies *, Polska Ciasteczkowa Zgoda ***"
+requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://secure.fanboy.co.nz/fanboy-cookiemonster.txt, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it"
+requiredTitle = "EasyList, Polskie Filtry, EasyList Cookie List *, Polska Ciasteczkowa Zgoda ***"
 requiredType = "abp, abp, abp, normal"
 adblocker = "ABP"
 category = "ciasteczka"
@@ -51,8 +51,8 @@ desc = "Wyskakujące okienka, widgety, newslettery, powiadomienia push, strzałk
 subscribe = "https://raw.githubusercontent.com/FiltersHeroes/PolishAnnoyanceFilters/master/PPB.txt"
 issues = "https://github.com/FiltersHeroes/PolishAnnoyanceFilters/issues"
 home = "https://polishannoyancefilters.netlify.app/"
-requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://www.i-dont-care-about-cookies.eu/abp/, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it"
-requiredTitle = "EasyList, Polskie Filtry, I don't care about cookies *, Polska Ciasteczkowa Zgoda ***"
+requiredLocation = "https://easylist.to/easylist/easylist.txt, https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/polish-adblock-filters/adblock.txt, https://secure.fanboy.co.nz/fanboy-cookiemonster.txt, https://github.com/FiltersHeroes/PolishCookieConsent#how-to-install-it"
+requiredTitle = "EasyList, Polskie Filtry, EasyList Cookie List *, Polska Ciasteczkowa Zgoda ***"
 requiredType = "abp, abp, abp, normal"
 adblocker = "ABP"
 category = "irytujące, ciasteczka"
@@ -216,6 +216,17 @@ home = "https://github.com/hoshsadiq/adblock-nocoin-list"
 adblocker = "ABP"
 category = "bezpieczeństwo"
 
+[[items]]
+title = "EasyList Cookie List"
+desc = "Komunikaty dot. ciasteczek i polityki prywatności/RODO."
+subscribe = "https://secure.fanboy.co.nz/fanboy-cookiemonster.txt"
+mail = "[email protected]"
+home = "https://easylist.to/"
+category = "ciasteczka"
+adblocker = "ABP"
+uBO_supp = "https://ublockorigin.github.io/uAssets/filters/annoyances-cookies.txt"
+issues = "https://forums.lanik.us/"
+
 [[items]]
 title = "I don't care about cookies"
 desc = "Komunikaty dot. ciasteczek i polityki prywatności/RODO."
@@ -282,6 +293,34 @@ requiredLocation = "https://github.com/FiltersHeroes/ScriptsPlayground/blob/mast
 mirror = "GitLab"
 mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror/KADhole.txt"
 
+[[items]]
+title = "KADomains"
+desc = "Przekręty SMS i oszustwa (domeny i adresy IP)."
+subscribe = "https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADomains.txt"
+issues = "https://github.com/FiltersHeroes/KADhosts/issues"
+form = "https://kadantiscam.netlify.app/#contact"
+mail = "[email protected]"
+home = "https://kadantiscam.netlify.app/"
+adblocker = "FG"
+category = "bezpieczeństwo"
+lang = "pl"
+mirror = "GitLab"
+mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror//KADomains.txt"
+
+[[items]]
+title = "KAD - Dnsmasq Edition (Beta)"
+desc = "Przekręty SMS i oszustwa."
+subscribe = "https://raw.githubusercontent.com/FiltersHeroes/KADhosts/master/KADdnsmasq.txt"
+issues = "https://github.com/FiltersHeroes/KADhosts/issues"
+form = "https://kadantiscam.netlify.app/#contact"
+mail = "[email protected]"
+home = "https://kadantiscam.netlify.app/"
+adblocker = "Dmq"
+category = "bezpieczeństwo"
+lang = "pl"
+mirror = "GitLab"
+mirrorURL = "https://filtersheroes.gitlab.io/AssetsMirror/KADdnsmasq.txt"
+
 [[items]]
 title = "Polskie Filtry do Pi-hole"
 desc = "Reklamy zewnętrzne, linki afiliacyjne, skrypty śledzące i kolektory informacji."

website/layouts/partials/FilterListsTable.html

@@ -22,6 +22,8 @@
 		<option value="uBO" data-icon="icon-dropdown uBO-icon">uBlock Origin</option>
 		<option value="AG" data-icon="icon-dropdown AG-icon">AdGuard</option>
 		<option value="Ph" data-icon="icon-dropdown Ph-icon">Pi-hole</option>
+		<option value="Dmq" data-icon="icon-dropdown Dmq-icon">Dnsmasq</option>
+		<option value="FG" data-icon="icon-dropdown FG-icon">FortiGate</option>
 		<option value="hosts" data-icon="icon-dropdown AA-icon">AdAway</option>
 		<option value="hosts" data-icon="icon-dropdown Blokada-icon">Blokada</option>
 		<option value="hosts" data-icon="icon-dropdown AGHome-icon">AdGuard Home</option>
@@ -60,7 +62,7 @@
 			<td class="align-middle" data-label="LINKI">
 				<div class="span">
 					<div class="btn-group-vertical">
-						{{ if not (findRE .adblocker "hosts|Ph" ) }}
+						{{ if not (findRE .adblocker "hosts|Ph|Dmq|FG" ) }}
 						<a class="btn btn-primary mb-2r" href="{{ if findRE "AB|ABP|AG" .adblocker }}abp{{ else if findRE "uBO|NA" .adblocker }}ubo{{end}}:subscribe?location={{.subscribe}}&amp;title={{ trim .title "* " }}">
 							<i class="fas fa-file-import fa-fw"></i>{{ i18n "subscribe" }}
 						</a>
@@ -121,7 +123,7 @@
 					{{ if and (not (in $filterlist.subscribe "raw.githubusercontent.com")) (not $filterlist.mirror) }} - {{ end }}
 					<div class="btn-group-vertical">
 						{{/*  Subskrybuj  */}}
-						{{ if not (findRE .adblocker "hosts|Ph" ) }}
+						{{ if not (findRE .adblocker "hosts|Ph|Dmq|FG" ) }}
 
 						{{ if or (in .subscribe "raw.githubusercontent.com") (.mirror) }}
 						<div class="btn-group dropright">
@@ -296,6 +298,14 @@
 					<a href="https://pi-hole.net/" target="_blank" rel="noopener"><img src="{{ "images/Pi-hole.svg" | relURL }}" style="width:32px;height:32px" title="Pi-hole"></a>
 					{{end}}
 
+					{{ if findRE "Dmq" .adblocker }}
+					<a href="https://thekelleys.org.uk/dnsmasq/doc.html" target="_blank" rel="noopener"><img src="{{ "images/Dnsmasq.svg" | relURL }}" style="width:32px;height:32px" title="Dnsmasq"></a>
+					{{end}}
+
+					{{ if findRE "FG" .adblocker }}
+					<a href="https://docs.fortinet.com/document/fortigate/7.4.3/administration-guide/9463/threat-feeds" target="_blank" rel="noopener"><img src="{{ "images/FTNT.svg" | relURL }}" style="width:32px;height:32px" title="FortiGate"></a>
+					{{end}}
+
 					{{ if .requiredTitle }}
 					<div class="d-block pt-2">
 						<div class="btn-group-vertical">