From 55e17f6065f8e82d4e23328a47286c6e53a0855b Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 13 Feb 2018 19:13:52 -0600 Subject: [PATCH] add Go Hosts closes #188 --- data/FilterList.json | 34 ++++++++++++++++++++++++++++++++++ data/FilterListLanguage.json | 8 ++++++++ data/FilterListMaintainer.json | 8 ++++++++ data/Maintainer.json | 11 +++++++++-- data/Merge.json | 4 ++++ 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 0033cf847..f2c0ce838 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -5744,5 +5744,39 @@ "submissionUrl": null, "syntaxId": 1, "viewUrl": "https://sites.google.com/site/cosmonoteshosts/hosts_Ultimate.txt" + }, + { + "id": 339, + "description": "Chinese hosts lists blocking sites like Gamil, Instagram, Wikipedia, Yahoo, Telegram(WEB), Dropbox, Flipboard, Mage, Line, Pinterest, W3schools, Ingress, Twitch, SoundCloud, Xboxlive, WordPress, Tapatalk, Kobo, Vimeo, Nytimes, Issuu, Tor, DuckDuckGo, Imgur, Pcbeta...", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/Lerist/Go-Hosts", + "issuesUrl": "https://github.com/Lerist/Go-Hosts/issues", + "licenseId": 2, + "name": "Go Hosts AD", + "policyUrl": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Lerist/Go-Hosts/master/hosts-ad" + }, + { + "id": 340, + "description": "Chinese hosts lists blocking sites like Google, Google Play, YouTube, Twitter, Facebook, Tumblr, Pixiv", + "descriptionSourceUrl": null, + "discontinuedDate": null, + "donateUrl": null, + "emailAddress": null, + "forumUrl": null, + "homeUrl": "https://github.com/Lerist/Go-Hosts", + "issuesUrl": "https://github.com/Lerist/Go-Hosts/issues", + "licenseId": 2, + "name": "Go Hosts", + "policyUrl": null, + "submissionUrl": null, + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/Lerist/Go-Hosts/master/hosts" } ] \ No newline at end of file diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json index 5533eb749..aed9c88bf 100644 --- a/data/FilterListLanguage.json +++ b/data/FilterListLanguage.json @@ -118,5 +118,13 @@ { "filterListId": 338, "languageId": 141 + }, + { + "filterListId": 339, + "languageId": 99 + }, + { + "filterListId": 340, + "languageId": 99 } ] \ No newline at end of file diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index fe5ee4617..aa8bec63f 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -314,5 +314,13 @@ { "filterListId": 338, "maintainerId": 42 + }, + { + "filterListId": 339, + "maintainerId": 43 + }, + { + "filterListId": 340, + "maintainerId": 43 } ] \ No newline at end of file diff --git a/data/Maintainer.json b/data/Maintainer.json index 72a7d5c53..239d9c13e 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -276,14 +276,21 @@ "id": 41, "emailAddress": null, "homeUrl": "https://github.com/multiverse2011", - "name": "multiverse2011", + "name": "Multiverse2011", "twitterHandle": "multiverse2011_" }, { "id": 42, "emailAddress": null, "homeUrl": "http://cosmonote.blogspot.jp", - "name": "cosmonote", + "name": "Cosmonote", + "twitterHandle": null + }, + { + "id": 43, + "emailAddress": null, + "homeUrl": "https://github.com/Lerist", + "name": "Lerist", "twitterHandle": null } ] \ No newline at end of file diff --git a/data/Merge.json b/data/Merge.json index d17a65b9a..02978cd8f 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -226,5 +226,9 @@ { "mergeFilterListId": 271, "upstreamFilterListId": 338 + }, + { + "mergeFilterListId": 309, + "upstreamFilterListId": 340 } ] \ No newline at end of file