From 0ddb86083721769f8c4448344c22f090e932039e Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 15 Apr 2022 12:47:24 -0500 Subject: [PATCH] =?UTF-8?q?feat(dir):=20=E2=9C=A8=20add=20No=20Google=20(U?= =?UTF-8?q?nbound)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/Directory/data/FilterList.json | 69 ++++++----- .../Directory/data/FilterListMaintainer.json | 116 ++++++++++++++++++ services/Directory/data/FilterListSyntax.json | 4 + services/Directory/data/FilterListTag.json | 4 + .../Directory/data/FilterListViewUrl.json | 6 + services/Directory/data/Maintainer.json | 5 + 6 files changed, 174 insertions(+), 30 deletions(-) diff --git a/services/Directory/data/FilterList.json b/services/Directory/data/FilterList.json index 58ad7e70e..fd46c4d8e 100644 --- a/services/Directory/data/FilterList.json +++ b/services/Directory/data/FilterList.json @@ -10473,20 +10473,20 @@ "name": "ROad-Kill" }, { - "description": "Completely block Google and its services .", + "description": "Completely block Google and its services.", "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1673, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google (Domains)" }, { - "description": "Completely block Google and its services .", + "description": "Completely block Google and its services.", "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1674, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google (Hosts)" }, @@ -10495,7 +10495,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1675, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google analytics (Domains)" }, @@ -10504,7 +10504,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1676, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google analytics (Hosts)" }, @@ -10513,7 +10513,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1677, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Android (Domains)" }, @@ -10522,7 +10522,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1678, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Android (Hosts)" }, @@ -10531,7 +10531,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1679, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google DNS (Domains)" }, @@ -10540,7 +10540,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1680, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google DNS (Hosts)" }, @@ -10549,7 +10549,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1681, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google search (Domains)" }, @@ -10558,7 +10558,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1682, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google search (Hosts)" }, @@ -10567,7 +10567,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1683, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | DoubleClick (Domains)" }, @@ -10576,7 +10576,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1684, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "no-google | DoubleClick (Hosts)" }, @@ -10585,7 +10585,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1685, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Firebase (Domains)" }, @@ -10594,7 +10594,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1686, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Firebase (Hosts)" }, @@ -10603,7 +10603,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1687, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google fonts (Domains)" }, @@ -10612,7 +10612,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1688, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google fonts (Hosts)" }, @@ -10621,7 +10621,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1689, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "no-google | General Google domains (Domains)" }, @@ -10630,7 +10630,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1690, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | General Google domains (Hosts)" }, @@ -10639,7 +10639,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1691, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Gmail (Domains)" }, @@ -10648,7 +10648,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1692, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Gmail (Hosts)" }, @@ -10657,7 +10657,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1693, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google products (Domains)" }, @@ -10666,7 +10666,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1694, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google products (Hosts)" }, @@ -10675,7 +10675,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1695, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google proxies (Domains)" }, @@ -10684,7 +10684,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1696, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google| Google proxies (Hosts)" }, @@ -10693,7 +10693,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1697, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google shorteners (Domains)" }, @@ -10702,7 +10702,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1698, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Google shorteners (Hosts)" }, @@ -10711,7 +10711,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1699, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Youtube (Domains)" }, @@ -10720,7 +10720,7 @@ "emailAddress": "poorpocketsmcnewhold@pm.me", "homeUrl": "https://github.com/nickspaargaren/no-google", "id": 1700, - "issuesUrl": "https://github.com/nickspaargaren/no-google/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc", + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", "licenseId": 11, "name": "No Google | Youtube (Hosts)" }, @@ -17418,5 +17418,14 @@ "issuesUrl": "https://github.com/twcau/AdblockRules/issues", "licenseId": 28, "name": "CytroxList" + }, + { + "description": "Completely block Google and its services.", + "emailAddress": "poorpocketsmcnewhold@pm.me", + "homeUrl": "https://github.com/nickspaargaren/no-google", + "id": 2587, + "issuesUrl": "https://github.com/nickspaargaren/no-google/issues", + "licenseId": 11, + "name": "No Google (Unbound)" } ] diff --git a/services/Directory/data/FilterListMaintainer.json b/services/Directory/data/FilterListMaintainer.json index 21648673b..6ee5acae1 100644 --- a/services/Directory/data/FilterListMaintainer.json +++ b/services/Directory/data/FilterListMaintainer.json @@ -5854,5 +5854,121 @@ { "filterListId": 2586, "maintainerId": 178 + }, + { + "filterListId": 2587, + "maintainerId": 179 + }, + { + "filterListId": 1673, + "maintainerId": 179 + }, + { + "filterListId": 1674, + "maintainerId": 179 + }, + { + "filterListId": 1675, + "maintainerId": 179 + }, + { + "filterListId": 1676, + "maintainerId": 179 + }, + { + "filterListId": 1677, + "maintainerId": 179 + }, + { + "filterListId": 1678, + "maintainerId": 179 + }, + { + "filterListId": 1679, + "maintainerId": 179 + }, + { + "filterListId": 1680, + "maintainerId": 179 + }, + { + "filterListId": 1681, + "maintainerId": 179 + }, + { + "filterListId": 1682, + "maintainerId": 179 + }, + { + "filterListId": 1683, + "maintainerId": 179 + }, + { + "filterListId": 1684, + "maintainerId": 179 + }, + { + "filterListId": 1685, + "maintainerId": 179 + }, + { + "filterListId": 1686, + "maintainerId": 179 + }, + { + "filterListId": 1687, + "maintainerId": 179 + }, + { + "filterListId": 1688, + "maintainerId": 179 + }, + { + "filterListId": 1689, + "maintainerId": 179 + }, + { + "filterListId": 1690, + "maintainerId": 179 + }, + { + "filterListId": 1691, + "maintainerId": 179 + }, + { + "filterListId": 1692, + "maintainerId": 179 + }, + { + "filterListId": 1693, + "maintainerId": 179 + }, + { + "filterListId": 1694, + "maintainerId": 179 + }, + { + "filterListId": 1695, + "maintainerId": 179 + }, + { + "filterListId": 1696, + "maintainerId": 179 + }, + { + "filterListId": 1697, + "maintainerId": 179 + }, + { + "filterListId": 1698, + "maintainerId": 179 + }, + { + "filterListId": 1699, + "maintainerId": 179 + }, + { + "filterListId": 1700, + "maintainerId": 179 } ] diff --git a/services/Directory/data/FilterListSyntax.json b/services/Directory/data/FilterListSyntax.json index a7a642469..e08231ea9 100644 --- a/services/Directory/data/FilterListSyntax.json +++ b/services/Directory/data/FilterListSyntax.json @@ -8730,5 +8730,9 @@ { "filterListId": 2586, "syntaxId": 3 + }, + { + "filterListId": 2587, + "syntaxId": 24 } ] diff --git a/services/Directory/data/FilterListTag.json b/services/Directory/data/FilterListTag.json index 7d3c5a967..207cf3abc 100644 --- a/services/Directory/data/FilterListTag.json +++ b/services/Directory/data/FilterListTag.json @@ -12638,5 +12638,9 @@ { "filterListId": 2582, "tagId": 10 + }, + { + "filterListId": 2587, + "tagId": 19 } ] diff --git a/services/Directory/data/FilterListViewUrl.json b/services/Directory/data/FilterListViewUrl.json index 33dcaa931..a4d006c90 100644 --- a/services/Directory/data/FilterListViewUrl.json +++ b/services/Directory/data/FilterListViewUrl.json @@ -16168,5 +16168,11 @@ "id": 2851, "primariness": 1, "url": "https://raw.githubusercontent.com/twcau/AdblockRules/master/CytroxList" + }, + { + "filterListId": 2587, + "id": 2852, + "primariness": 1, + "url": "https://raw.githubusercontent.com/nickspaargaren/no-google/master/pihole-google-unbound.conf" } ] diff --git a/services/Directory/data/Maintainer.json b/services/Directory/data/Maintainer.json index b6b8e3019..04200d7d8 100644 --- a/services/Directory/data/Maintainer.json +++ b/services/Directory/data/Maintainer.json @@ -926,5 +926,10 @@ "id": 178, "name": "Michael H", "url": "https://github.com/twcau" + }, + { + "id": 179, + "name": "Nick Spaargaren", + "url": "https://github.com/nickspaargaren" } ]