prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1863 from DandelionSprout/patch-151

Browse source 
Early August pull 3
This commit is contained in:
Collin M. Barrett 2020-08-10 23:04:10 +00:00 committed by GitHub
commit 1f9c36ff00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 90772 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
data/FilterList.json
View file

@ -17301,7 +17301,8 @@
"name": "Energized Spark Protection (Domains)",
"submissionUrl": "https://app.energized.pro",
"syntaxId": 2,
"viewUrl": "https://block.energized.pro/spark/formats/domains.txt"
"viewUrl": "https://block.energized.pro/spark/formats/domains.txt",
"viewUrlMirror1": "https://blokada.org/mirror/v5/energized/spark/hosts.txt"
},
{
"chatUrl": "https://t.me/EnergizedProtection",
@ -17461,7 +17462,8 @@
"name": "Energized Regional Extension (Domains)",
"submissionUrl": "https://app.energized.pro",
"syntaxId": 2,
"viewUrl": "https://block.energized.pro/extensions/regional/formats/domains.txt"
"viewUrl": "https://block.energized.pro/extensions/regional/formats/domains.txt",
"viewUrlMirror1": "https://blokada.org/mirror/v5/energized/regional/hosts.txt"
},
{
"chatUrl": "https://t.me/EnergizedProtection",
@ -23844,5 +23846,78 @@
"name": "jiekouAD",
"syntaxId": 4,
"viewUrl": "https://gitee.com/damengzhudamengzhu/guanggaoguolv/raw/master/jiekouAD.txt"
},
{
"description": "Some PR-Chinese filterlist makers apparently decided to block Falun Gong websites in their anti-ad lists for reasons that had absolutely nothing to do with ads, tracking or malware, and despite the sites already being megablocked within their country. So if you live abroad, and use any of the affected lists, this list is for you.",
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"id": 2366,
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 35,
"name": "Falukorv List",
"publishedDate": "2020-08-10T00:00:00",
"syntaxId": 28,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/FalukorvList.txt",
"viewUrlMirror1": "https://gitlab.com/DandelionSprout/adfilt/raw/master/FalukorvList.txt"
},
{
"description": "This host file is based on DuckDuckGo Tracker Radar.",
"homeUrl": "https://go.blokada.org/ddgtrackerradar",
"id": 2367,
"licenseId": 9,
"name": "DuckDuckGo Tracker Radar",
"syntaxId": 2,
"viewUrl": "https://blokada.org/blocklists/ddgtrackerradar/standard/hosts.txt"
},
{
"description": "The V2Ray routing rules file is an enhanced version that replaces the official V2Ray geoip.dat and geosite.dat rules files. It's built automatically every day at 06:00 China Standard Time using GitHub Actions to keep your rules up to date.",
"homeUrl": "https://github.com/Loyalsoldier/v2ray-rules-dat/",
"id": 2368,
"issuesUrl": "https://github.com/Loyalsoldier/v2ray-rules-dat/issues",
"licenseId": 4,
"name": "Loyalsoldier's V2Ray Rules",
"syntaxId": 2,
"viewUrl": "https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt"
},
{
"description": "This list aims to remove Twitter thread comments that promote K-pop, that are in threads whose OPs have absolutely nothing whatsoever to do with K-pop (e.g. Struggle Tweets, Poorly Aged Things).",
"donateUrl": "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
"emailAddress": "imreeil42@gmail.com",
"homeUrl": "https://github.com/DandelionSprout/adfilt",
"id": 2369,
"issuesUrl": "https://github.com/DandelionSprout/adfilt/issues",
"licenseId": 35,
"name": "Anti-'K-pop spammers on Twitter' List",
"publishedDate": "2020-08-10T00:00:00",
"syntaxId": 3,
"viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiKpopSpammersTwitter.txt",
"viewUrlMirror1": "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiKpopSpammersTwitter.txt"
},
{
"description": "Hosts file, used to block some pop-up ads and casino ads. Feedback is welcome!",
"homeUrl": "https://github.com/Goooler/1024_hosts/",
"id": 2370,
"issuesUrl": "https://github.com/Goooler/1024_hosts/issues",
"licenseId": 18,
"name": "1024 Hosts",
"syntaxId": 1,
"viewUrl": "https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts"
},
{
"homeUrl": "https://github.com/adbyby/xwhyc-rules/",
"id": 2371,
"issuesUrl": "https://github.com/adbyby/xwhyc-rules/issues",
"name": "XWHYC Rules",
"syntaxId": 4,
"viewUrl": "https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt"
},
{
"homeUrl": "https://anti-ad.net/",
"id": 2372,
"issuesUrl": "https://github.com/privacy-protection-tools/dead-horse/issues",
"name": "anti-AD (Whitelist)",
"syntaxId": 50,
"viewUrl": "https://raw.githubusercontent.com/privacy-protection-tools/dead-horse/master/anti-ad-white-list.txt"
}
]

16
data/FilterListLanguage.json
View file

@ -3538,5 +3538,21 @@
{
"filterListId": 2365,
"languageId": 99
},
{
"filterListId": 2368,
"languageId": 99
},
{
"filterListId": 2370,
"languageId": 99
},
{
"filterListId": 2371,
"languageId": 99
},
{
"filterListId": 2372,
"languageId": 99
}
]

32
data/FilterListMaintainer.json
View file

@ -743,6 +743,14 @@
"filterListId": 20,
"maintainerId": 22
},
{
"filterListId": 248,
"maintainerId": 22
},
{
"filterListId": 267,
"maintainerId": 22
},
{
"filterListId": 327,
"maintainerId": 22
@ -807,6 +815,10 @@
"filterListId": 680,
"maintainerId": 22
},
{
"filterListId": 775,
"maintainerId": 22
},
{
"filterListId": 816,
"maintainerId": 22
@ -1215,6 +1227,14 @@
"filterListId": 2287,
"maintainerId": 22
},
{
"filterListId": 2366,
"maintainerId": 22
},
{
"filterListId": 2369,
"maintainerId": 22
},
{
"filterListId": 1664,
"maintainerId": 23
@ -5183,6 +5203,18 @@
"filterListId": 2056,
"maintainerId": 146
},
{
"filterListId": 248,
"maintainerId": 147
},
{
"filterListId": 267,
"maintainerId": 147
},
{
"filterListId": 775,
"maintainerId": 147
},
{
"filterListId": 1866,
"maintainerId": 147

56
data/FilterListTag.json
View file

@ -11819,26 +11819,50 @@
"filterListId": 2356,
"tagId": 2
},
{
"filterListId": 2356,
"tagId": 22
},
{
"filterListId": 2357,
"tagId": 2
},
{
"filterListId": 2357,
"tagId": 22
},
{
"filterListId": 2358,
"tagId": 2
},
{
"filterListId": 2358,
"tagId": 22
},
{
"filterListId": 2359,
"tagId": 2
},
{
"filterListId": 2359,
"tagId": 22
},
{
"filterListId": 2360,
"tagId": 2
},
{
"filterListId": 2360,
"tagId": 22
},
{
"filterListId": 2361,
"tagId": 2
},
{
"filterListId": 2361,
"tagId": 22
},
{
"filterListId": 2362,
"tagId": 10
@ -11854,5 +11878,37 @@
{
"filterListId": 2365,
"tagId": 2
},
{
"filterListId": 2366,
"tagId": 10
},
{
"filterListId": 2367,
"tagId": 3
},
{
"filterListId": 2368,
"tagId": 2
},
{
"filterListId": 2369,
"tagId": 30
},
{
"filterListId": 2369,
"tagId": 35
},
{
"filterListId": 2370,
"tagId": 2
},
{
"filterListId": 2371,
"tagId": 2
},
{
"filterListId": 2372,
"tagId": 10
}
]

8
data/SoftwareSyntax.json
View file

@ -383,6 +383,10 @@
"softwareId": 28,
"syntaxId": 22
},
{
"softwareId": 31,
"syntaxId": 22
},
{
"softwareId": 33,
"syntaxId": 23
@ -619,6 +623,10 @@
"softwareId": 27,
"syntaxId": 36
},
{
"softwareId": 31,
"syntaxId": 36
},
{
"softwareId": 7,
"syntaxId": 37

58707
server/src/FilterLists.Data.Migrations/Migrations/20200810224446_1863.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

31652
server/src/FilterLists.Data.Migrations/Migrations/20200810224446_1863.cs Normal file
View file

File diff suppressed because it is too large Load diff

226
server/src/FilterLists.Data.Migrations/Migrations/FilterListsDbContextModelSnapshot.cs
View file

@ -18856,7 +18856,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
Name = "Energized Spark Protection (Domains)",
SubmissionUrl = "https://app.energized.pro",
SyntaxId = (short)2,
ViewUrl = "https://block.energized.pro/spark/formats/domains.txt"
ViewUrl = "https://block.energized.pro/spark/formats/domains.txt",
ViewUrlMirror1 = "https://blokada.org/mirror/v5/energized/spark/hosts.txt"
},
new
{
@ -19026,7 +19027,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
Name = "Energized Regional Extension (Domains)",
SubmissionUrl = "https://app.energized.pro",
SyntaxId = (short)2,
ViewUrl = "https://block.energized.pro/extensions/regional/formats/domains.txt"
ViewUrl = "https://block.energized.pro/extensions/regional/formats/domains.txt",
ViewUrlMirror1 = "https://blokada.org/mirror/v5/energized/regional/hosts.txt"
},
new
{
@ -26000,6 +26002,86 @@ Includes Blur Preview Thumbnails filters
Name = "jiekouAD",
SyntaxId = (short)4,
ViewUrl = "https://gitee.com/damengzhudamengzhu/guanggaoguolv/raw/master/jiekouAD.txt"
},
new
{
Id = (short)2366,
Description = "Some PR-Chinese filterlist makers apparently decided to block Falun Gong websites in their anti-ad lists for reasons that had absolutely nothing to do with ads, tracking or malware, and despite the sites already being megablocked within their country. So if you live abroad, and use any of the affected lists, this list is for you.",
DonateUrl = "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
EmailAddress = "imreeil42@gmail.com",
HomeUrl = "https://github.com/DandelionSprout/adfilt",
IssuesUrl = "https://github.com/DandelionSprout/adfilt/issues",
LicenseId = (short)35,
Name = "Falukorv List",
PublishedDate = new DateTime(2020, 8, 10, 0, 0, 0, 0, DateTimeKind.Unspecified),
SyntaxId = (short)28,
ViewUrl = "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/FalukorvList.txt",
ViewUrlMirror1 = "https://gitlab.com/DandelionSprout/adfilt/raw/master/FalukorvList.txt"
},
new
{
Id = (short)2367,
Description = "This host file is based on DuckDuckGo Tracker Radar.",
HomeUrl = "https://go.blokada.org/ddgtrackerradar",
LicenseId = (short)9,
Name = "DuckDuckGo Tracker Radar",
SyntaxId = (short)2,
ViewUrl = "https://blokada.org/blocklists/ddgtrackerradar/standard/hosts.txt"
},
new
{
Id = (short)2368,
Description = "The V2Ray routing rules file is an enhanced version that replaces the official V2Ray geoip.dat and geosite.dat rules files. It's built automatically every day at 06:00 China Standard Time using GitHub Actions to keep your rules up to date.",
HomeUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/",
IssuesUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/issues",
LicenseId = (short)4,
Name = "Loyalsoldier's V2Ray Rules",
SyntaxId = (short)2,
ViewUrl = "https://raw.githubusercontent.com/Loyalsoldier/v2ray-rules-dat/release/reject-list.txt"
},
new
{
Id = (short)2369,
Description = "This list aims to remove Twitter thread comments that promote K-pop, that are in threads whose OPs have absolutely nothing whatsoever to do with K-pop (e.g. Struggle Tweets, Poorly Aged Things).",
DonateUrl = "https://sproutsluckycorner.wordpress.com/2017/11/14/my-work-and-contact-resume/#donations",
EmailAddress = "imreeil42@gmail.com",
HomeUrl = "https://github.com/DandelionSprout/adfilt",
IssuesUrl = "https://github.com/DandelionSprout/adfilt/issues",
LicenseId = (short)35,
Name = "Anti-'K-pop spammers on Twitter' List",
PublishedDate = new DateTime(2020, 8, 10, 0, 0, 0, 0, DateTimeKind.Unspecified),
SyntaxId = (short)3,
ViewUrl = "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/AntiKpopSpammersTwitter.txt",
ViewUrlMirror1 = "https://gitlab.com/DandelionSprout/adfilt/raw/master/AntiKpopSpammersTwitter.txt"
},
new
{
Id = (short)2370,
Description = "Hosts file, used to block some pop-up ads and casino ads. Feedback is welcome!",
HomeUrl = "https://github.com/Goooler/1024_hosts/",
IssuesUrl = "https://github.com/Goooler/1024_hosts/issues",
LicenseId = (short)18,
Name = "1024 Hosts",
SyntaxId = (short)1,
ViewUrl = "https://raw.githubusercontent.com/Goooler/1024_hosts/master/hosts"
},
new
{
Id = (short)2371,
HomeUrl = "https://github.com/adbyby/xwhyc-rules/",
IssuesUrl = "https://github.com/adbyby/xwhyc-rules/issues",
Name = "XWHYC Rules",
SyntaxId = (short)4,
ViewUrl = "https://raw.githubusercontent.com/adbyby/xwhyc-rules/master/lazy.txt"
},
new
{
Id = (short)2372,
HomeUrl = "https://anti-ad.net/",
IssuesUrl = "https://github.com/privacy-protection-tools/dead-horse/issues",
Name = "anti-AD (Whitelist)",
SyntaxId = (short)50,
ViewUrl = "https://raw.githubusercontent.com/privacy-protection-tools/dead-horse/master/anti-ad-white-list.txt"
});
});
@ -30506,6 +30588,26 @@ Includes Blur Preview Thumbnails filters
{
FilterListId = (short)2365,
LanguageId = (short)99
},
new
{
FilterListId = (short)2368,
LanguageId = (short)99
},
new
{
FilterListId = (short)2370,
LanguageId = (short)99
},
new
{
FilterListId = (short)2371,
LanguageId = (short)99
},
new
{
FilterListId = (short)2372,
LanguageId = (short)99
});
});
@ -31461,6 +31563,16 @@ Includes Blur Preview Thumbnails filters
MaintainerId = (short)22
},
new
{
FilterListId = (short)248,
MaintainerId = (short)22
},
new
{
FilterListId = (short)267,
MaintainerId = (short)22
},
new
{
FilterListId = (short)327,
MaintainerId = (short)22
@ -31541,6 +31653,11 @@ Includes Blur Preview Thumbnails filters
MaintainerId = (short)22
},
new
{
FilterListId = (short)775,
MaintainerId = (short)22
},
new
{
FilterListId = (short)816,
MaintainerId = (short)22
@ -32051,6 +32168,16 @@ Includes Blur Preview Thumbnails filters
MaintainerId = (short)22
},
new
{
FilterListId = (short)2366,
MaintainerId = (short)22
},
new
{
FilterListId = (short)2369,
MaintainerId = (short)22
},
new
{
FilterListId = (short)1664,
MaintainerId = (short)23
@ -37011,6 +37138,21 @@ Includes Blur Preview Thumbnails filters
MaintainerId = (short)146
},
new
{
FilterListId = (short)248,
MaintainerId = (short)147
},
new
{
FilterListId = (short)267,
MaintainerId = (short)147
},
new
{
FilterListId = (short)775,
MaintainerId = (short)147
},
new
{
FilterListId = (short)1866,
MaintainerId = (short)147
@ -52174,31 +52316,61 @@ Includes Blur Preview Thumbnails filters
TagId = (short)2
},
new
{
FilterListId = (short)2356,
TagId = (short)22
},
new
{
FilterListId = (short)2357,
TagId = (short)2
},
new
{
FilterListId = (short)2357,
TagId = (short)22
},
new
{
FilterListId = (short)2358,
TagId = (short)2
},
new
{
FilterListId = (short)2358,
TagId = (short)22
},
new
{
FilterListId = (short)2359,
TagId = (short)2
},
new
{
FilterListId = (short)2359,
TagId = (short)22
},
new
{
FilterListId = (short)2360,
TagId = (short)2
},
new
{
FilterListId = (short)2360,
TagId = (short)22
},
new
{
FilterListId = (short)2361,
TagId = (short)2
},
new
{
FilterListId = (short)2361,
TagId = (short)22
},
new
{
FilterListId = (short)2362,
TagId = (short)10
@ -52217,6 +52389,46 @@ Includes Blur Preview Thumbnails filters
{
FilterListId = (short)2365,
TagId = (short)2
},
new
{
FilterListId = (short)2366,
TagId = (short)10
},
new
{
FilterListId = (short)2367,
TagId = (short)3
},
new
{
FilterListId = (short)2368,
TagId = (short)2
},
new
{
FilterListId = (short)2369,
TagId = (short)30
},
new
{
FilterListId = (short)2369,
TagId = (short)35
},
new
{
FilterListId = (short)2370,
TagId = (short)2
},
new
{
FilterListId = (short)2371,
TagId = (short)2
},
new
{
FilterListId = (short)2372,
TagId = (short)10
});
});
@ -53183,6 +53395,11 @@ Includes Blur Preview Thumbnails filters
SoftwareId = (short)28
},
new
{
SyntaxId = (short)22,
SoftwareId = (short)31
},
new
{
SyntaxId = (short)23,
SoftwareId = (short)33
@ -53478,6 +53695,11 @@ Includes Blur Preview Thumbnails filters
SoftwareId = (short)27
},
new
{
SyntaxId = (short)36,
SoftwareId = (short)31
},
new
{
SyntaxId = (short)37,
SoftwareId = (short)7