From 7090dfeb7441f998a923ee63e74240162e23e679 Mon Sep 17 00:00:00 2001 From: Kowith Singkornkeeree Date: Sat, 6 Oct 2018 21:24:35 +0700 Subject: [PATCH 1/2] Attempt to add 5 lists - Facebook Zuckestion Killer - Facebook Modules Command List - All of adservice.google.com and id.google.com regional hosts - Thai Paranoid Block ~Maximum~ - sipp11's Thai Ad Filters --- data/FilterList.json | 56 +++++++++++++++++++++++++++++++++- data/FilterListLanguage.json | 8 +++++ data/FilterListMaintainer.json | 20 ++++++++++++ data/FilterListTag.json | 36 ++++++++++++++++++++++ data/Maintainer.json | 5 +++ 5 files changed, 124 insertions(+), 1 deletion(-) diff --git a/data/FilterList.json b/data/FilterList.json index 21f10540a..2cd1b9a12 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8818,5 +8818,59 @@ "policyUrl": "https://pgl.yoyo.org/as/policy.php", "syntaxId": 20, "viewUrl": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=dnsmasq&showintro=1&mimetype=plaintext" + }, + { + "id": 843, + "description": "Zuckestion is not a typo! this filterlist is build from scratch based on personal usage experience of Facebook to eliminated most of ads, tracking, telemetry, suggestions that I've found by myself and then share these rules as filterlist, also support basic mode and touch mode for mobile browser users (Only support on Firefox for Android or any related forks that can install uBlock Origin extension). However, this list won't support Facebook site or domains that serve under 'Free Basics' services due to it's use and share your data as their profit to keep this service running on your region and/or worldwide.", + "descriptionSourceUrl": "https://github.com/kowith337/PersonalFilterListCollection/blob/master/filterlist/facebook/readme.md", + "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", + "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=label%3A%22Site%3A+Facebook%22", + "licenseId": 13, + "name": "Facebook Zuckestion Killer", + "syntaxId": 4, + "viewUrl": "https://github.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/facebook/FacebookZuckestionKiller.txt" + }, + { + "id": 844, + "description": "Sublist of Facebook filter to prevent some 'modules' connections, e.g. content chaining (click external link, like, react or save posts) that show the suggestions under posts that you've acted on.", + "descriptionSourceUrl": "https://github.com/kowith337/PersonalFilterListCollection/blob/master/filterlist/facebook/readme.md", + "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", + "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=label%3A%22Site%3A+Facebook%22", + "licenseId": 13, + "name": "Facebook Modules Command List", + "syntaxId": 4, + "viewUrl": "https://github.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/facebook/FacebookCommands.txt" + }, + { + "id": 845, + "description": "List of all regional subdomains of 'adservice.google.com' and 'id.google.com'", + "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", + "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=is%3Aissue+label%3A%22Hosts+File%22", + "licenseId": 13, + "name": "All of adservice.google.com and id.google.com regional hosts", + "syntaxId": 1, + "viewUrl": "https://github.com/kowith337/PersonalFilterListCollection/raw/master/hosts/hosts_google_adservice_id.txt" + }, + { + "id": 846, + "description": "A zero tolerance version of Thai Paranoid Block, you need to be careful before using this because this filter will be strict blocking well-known ads and trackings that use in Thai sites without any reasonable to whitelist them, period!", + "descriptionSourceUrl": "https://github.com/kowith337/ThaiParanoidBlock/blob/maximum/readme.md", + "homeUrl": "https://github.com/kowith337/ThaiParanoidBlock/tree/maximum", + "issuesUrl": "https://github.com/kowith337/ThaiParanoidBlock/issues", + "licenseId": 13, + "name": "Thai Paranoid Block ~Maximum~", + "syntaxId": 4, + "viewUrl": "https://github.com/kowith337/ThaiParanoidBlock/raw/maximum/ThaiParanoid.txt" + }, + { + "id": 847, + "description": "Get ads out of the way, applied mostly with Thai sites since there are tons of Easylist coverage is good outside already.", + "descriptionSourceUrl": "https://github.com/sipp11/th_ad_filters/blob/master/README.md", + "homeUrl": "https://github.com/sipp11/th_ad_filters", + "issuesUrl": "https://github.com/sipp11/th_ad_filters/issues", + "licenseId": 5, + "name": "sipp11's Thai Ad Filters", + "syntaxId": 3, + "viewUrl": "https://github.com/sipp11/th_ad_filters/raw/master/th_list.txt" } - ] +] diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 2d77be2a6..d64966865 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -1146,5 +1146,13 @@ { "filterListId": 839, "languageId": 163 + }, + { + "filterListId": 846, + "languageId": 87 + }, + { + "filterListId": 847, + "languageId": 87 } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 1eec49852..8c3d2beb0 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -951,6 +951,22 @@ "filterListId": 734, "maintainerId": 38 }, + { + "filterListId": 843, + "maintainerId": 38 + }, + { + "filterListId": 844, + "maintainerId": 38 + }, + { + "filterListId": 845, + "maintainerId": 38 + }, + { + "filterListId": 846, + "maintainerId": 38 + }, { "filterListId": 333, "maintainerId": 39 @@ -2143,4 +2159,8 @@ "filterListId": 451, "maintainerId": 105 } + { + "filterListId": 847, + "maintainerId": 106 + } ] diff --git a/data/FilterListTag.json b/data/FilterListTag.json index ed12f509b..492c28b12 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -3926,5 +3926,41 @@ { "filterListId": 842, "tagId": 2 + }, + { + "filterListId": 843, + "tagId": 3 + }, + { + "filterListId": 843, + "tagId": 4 + }, + { + "filterListId": 843, + "tagId": 9 + }, + { + "filterListId": 844, + "tagId": 3 + }, + { + "filterListId": 844, + "tagId": 4 + }, + { + "filterListId": 845, + "tagId": 3 + }, + { + "filterListId": 846, + "tagId": 2 + }, + { + "filterListId": 846, + "tagId": 3 + }, + { + "filterListId": 847, + "tagId": 2 } ] diff --git a/data/Maintainer.json b/data/Maintainer.json index 57b368c0b..e2333fa3a 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -547,5 +547,10 @@ "id": 105, "homeUrl": "https://github.com/crazy-max", "name": "CrazyMax" + }, + { + "id": 106, + "homeUrl": "https://github.com/sipp11", + "name": "sipp11" } ] \ No newline at end of file From e78cc223a5f35a5e80423fcb9d2477c4cbf65c50 Mon Sep 17 00:00:00 2001 From: Kowith Singkornkeeree Date: Sat, 6 Oct 2018 21:34:08 +0700 Subject: [PATCH 2/2] Edit some descriptions --- data/FilterList.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 2cd1b9a12..b09754a83 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8821,7 +8821,7 @@ }, { "id": 843, - "description": "Zuckestion is not a typo! this filterlist is build from scratch based on personal usage experience of Facebook to eliminated most of ads, tracking, telemetry, suggestions that I've found by myself and then share these rules as filterlist, also support basic mode and touch mode for mobile browser users (Only support on Firefox for Android or any related forks that can install uBlock Origin extension). However, this list won't support Facebook site or domains that serve under 'Free Basics' services due to it's use and share your data as their profit to keep this service running on your region and/or worldwide.", + "description": "Zuckestion is not a typo! this filterlist is build nearly from scratch based on personal usage experience of Facebook to eliminated most of ads, tracking, telemetry, suggestions that I've found by myself and then share these rules as filterlist, also support basic mode and touch mode for mobile browser users (Only support on Firefox for Android or any related forks that can install uBlock Origin extension). However, this list won't support Facebook site or domains that serve under 'Free Basics' services.", "descriptionSourceUrl": "https://github.com/kowith337/PersonalFilterListCollection/blob/master/filterlist/facebook/readme.md", "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=label%3A%22Site%3A+Facebook%22", @@ -8853,7 +8853,7 @@ }, { "id": 846, - "description": "A zero tolerance version of Thai Paranoid Block, you need to be careful before using this because this filter will be strict blocking well-known ads and trackings that use in Thai sites without any reasonable to whitelist them, period!", + "description": "A zero tolerance version of Thai Paranoid Block, you need to be careful before using this because this filter will be strict blocking well-known ads and trackings that use in Thai sites without any reasonable to whitelist them!", "descriptionSourceUrl": "https://github.com/kowith337/ThaiParanoidBlock/blob/maximum/readme.md", "homeUrl": "https://github.com/kowith337/ThaiParanoidBlock/tree/maximum", "issuesUrl": "https://github.com/kowith337/ThaiParanoidBlock/issues",