From b4899082c0cabbf6e16f2e9ec7c11c6a01651c1e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 27 Sep 2018 06:17:58 +0200 Subject: [PATCH 1/3] Added yet more lists --- data/FilterList.json | 109 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 104 insertions(+), 5 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 727a3d81c..b254ff8f7 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -1921,7 +1921,9 @@ "licenseId": 5, "name": "Ayucat Powerful List", "syntaxId": 3, - "viewUrl": "http://git.sourceforge.jp/view?p=ayucat-list/ayucat-list.git;a=blob_plain;f=ayucat-list.txt;hb=b254c74c132832a3ade7b9d42c2ef8d3dd59fdb9" + "viewUrl": "http://git.sourceforge.jp/view?p=ayucat-list/ayucat-list.git;a=blob_plain;f=ayucat-list.txt;hb=b254c74c132832a3ade7b9d42c2ef8d3dd59fdb9", + "viewUrlMirror1": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Ayucat%20Powerful%20List.txt", + "viewUrlMirror2": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Ayucat%20Powerful%20List.txt" }, { "id": 182, @@ -2528,7 +2530,9 @@ "licenseId": 5, "name": "Facebook Privacy List", "syntaxId": 3, - "viewUrl": "http://www.squirrelconspiracy.net/abp/facebook-privacy-list.txt" + "viewUrl": "http://www.squirrelconspiracy.net/abp/facebook-privacy-list.txt", + "viewUrlMirror1": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Facebook%20Privacy%20List.txt", + "viewUrlMirror2": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Facebook%20Privacy%20List.txt" }, { "id": 235, @@ -3016,7 +3020,9 @@ "licenseId": 5, "name": "Czech Filters for AdBlock", "syntaxId": 3, - "viewUrl": "http://adblock.dajbych.net/adblock.txt" + "viewUrl": "http://adblock.dajbych.net/adblock.txt", + "viewUrlMirror1": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Czech%20Filters%20for%20Adblock%20Plus", + "viewUrlMirror2": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Czech%20Filters%20for%20Adblock%20Plus" }, { "id": 278, @@ -8302,5 +8308,98 @@ "name": "EasyList Spanish + EasyList (TPL)", "syntaxId": 10, "viewUrl": "https://easylist-msie.adblockplus.org/easylistspanish+easylist.tpl" - } -] \ No newline at end of file + }, + { + "id": 801, + "description": "This is a Macedonian list", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/ABP%20Macedonian%20List.txt", + "discontinuedDate": "2011-05-11T00:00:00", + "homeUrl": "https://github.com/DandelionSprout/adfilt/tree/master/AncientLibrary", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "name": "ABP Macedonian List", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/ABP%20Macedonian%20List.txt" + }, + { + "id": 802, + "description": "Algerian filters for Adblock Plus", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Liste%20DZ.txt", + "discontinuedDate": "2011-05-25T00:00:00", + "homeUrl": "https://github.com/DandelionSprout/adfilt/tree/master/AncientLibrary", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 6, + "name": "Liste DZ", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Liste%20DZ.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Liste%20DZ.txt" + }, + { + "id": 803, + "description": "General icelandic ad and blocking subscription", + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Snaevar87's%20Icelandic%20filter.txt", + "discontinuedDate": "2014-03-11T00:00:00", + "homeUrl": "https://github.com/DandelionSprout/adfilt/tree/master/AncientLibrary", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "name": "Snaevar87's Icelandic filter", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/Snaevar87's%20Icelandic%20filter.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/Snaevar87%27s%20Icelandic%20filter.txt" + }, + { + "id": 804, + "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/TamilFriends%20List.txt", + "discontinuedDate": "2010-07-30T00:00:00", + "emailAddress": "tamilfriendslist@gmail.com", + "homeUrl": "https://github.com/DandelionSprout/adfilt/tree/master/AncientLibrary", + "issuesUrl": "https://github.com/DandelionSprout/adfilt/issues", + "licenseId": 16, + "name": "TamilFriends List", + "syntaxId": 3, + "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/TamilFriends%20List.txt", + "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/AncientLibrary/TamilFriends%20List.txt" + }, + { + "id": 805, + "description": "A combined version of the filterlist RU AdList against advertising, and an experimental list of cosmetic CSS style fixes. At the moment it only works normally in uBlock Origin.", + "descriptionSourceUrl": "https://easylist-downloads.adblockplus.org/advblock+cssfixes.txt", + "forumUrl": "https://forums.lanik.us/viewforum.php?f=102", + "homeUrl": "https://forums.lanik.us/viewforum.php?f=102", + "name": "RU AdList + CSS Fixes", + "syntaxId": 4, + "viewUrl": "https://easylist-downloads.adblockplus.org/advblock+cssfixes.txt" + }, + { + "id": 806, + "emailAddress": "easylist.portuguese@gmail.com", + "homeUrl": "https://easylist.to/", + "licenseId": 4, + "name": "EasyList Portuguese", + "syntaxId": 3, + "viewUrl": "https://easylist-downloads.adblockplus.org/easylistportuguese.txt" + }, + { + "id": 807, + "description": "This is a cosmetic filter for the uBlock Origin extension (with adblock support) to automatically filter all the pro-5-Star comments and the \"anti-information\" pages they share with sensationalistic headlines.", + "descriptionSourceUrl": "https://github.com/luigimannoni/m5s-ublock-filter#cosa-%C3%A9", + "homeUrl": "https://github.com/luigimannoni/m5s-ublock-filter", + "issuesUrl": "https://github.com/luigimannoni/m5s-ublock-filter/issues", + "name": "M5S uBlock Filter", + "syntaxId": 4, + "viewUrl": "https://raw.githubusercontent.com/luigimannoni/m5s-ublock-filter/master/filter-list.txt" + }, + { + "id": 808, + "homeUrl": "https://ajnasz.hu/adblock", + "name": "ajnasz's list", + "syntaxId": 3, + "viewUrl": "https://ajnasz.hu/adblock/recent" + }, + { + "id": 809, + "discontinuedDate": "2014-12-15T00:00:00", + "homeUrl": "https://www.ergensin.nl/", + "name": "NLblock", + "syntaxId": 3, + "viewUrl": "http://www.verzijlbergh.com/adblock/nlblock.txt" + } +] From fbc9caebcec86438e77ba1bd7a82b8ed9cf154c7 Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 27 Sep 2018 06:24:21 +0200 Subject: [PATCH 2/3] Attempting to fix an unknown syntax error --- data/FilterList.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index b254ff8f7..7100122bd 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -8310,7 +8310,7 @@ "viewUrl": "https://easylist-msie.adblockplus.org/easylistspanish+easylist.tpl" }, { - "id": 801, + "id": 801, "description": "This is a Macedonian list", "descriptionSourceUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AncientLibrary/ABP%20Macedonian%20List.txt", "discontinuedDate": "2011-05-11T00:00:00", @@ -8379,7 +8379,7 @@ }, { "id": 807, - "description": "This is a cosmetic filter for the uBlock Origin extension (with adblock support) to automatically filter all the pro-5-Star comments and the \"anti-information\" pages they share with sensationalistic headlines.", + "description": "This is a cosmetic filter for the uBlock Origin extension (with adblock support) to automatically filter all the pro-5-Star comments and the 'anti-information' pages they share with sensationalistic headlines.", "descriptionSourceUrl": "https://github.com/luigimannoni/m5s-ublock-filter#cosa-%C3%A9", "homeUrl": "https://github.com/luigimannoni/m5s-ublock-filter", "issuesUrl": "https://github.com/luigimannoni/m5s-ublock-filter/issues", @@ -8402,4 +8402,4 @@ "syntaxId": 3, "viewUrl": "http://www.verzijlbergh.com/adblock/nlblock.txt" } -] + ] From 039831d27292c4da326790968bf70991eece249b Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Thu, 27 Sep 2018 06:33:34 +0200 Subject: [PATCH 3/3] Assigned languages to 10 lists --- data/FilterListLanguage.json | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 1a092f6e7..27ba0ebf4 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -997,6 +997,42 @@ }, { "filterListId": 800, - "languageId": 59 + "languageId": 79 + }, + { + "filterListId": 801, + "languageId": 29 + }, + { + "filterListId": 802, + "languageId": 122 + }, + { + "filterListId": 803, + "languageId": 160 + }, + { + "filterListId": 804, + "languageId": 84 + }, + { + "filterListId": 805, + "languageId": 18 + }, + { + "filterListId": 806, + "languageId": 13 + }, + { + "filterListId": 807, + "languageId": 159 + }, + { + "filterListId": 808, + "languageId": 177 + }, + { + "filterListId": 809, + "languageId": 108 } -] \ No newline at end of file +]