From 39ad23c0ba25c3aa4cffd58d4e5ca3f7acfdf01f Mon Sep 17 00:00:00 2001
From: collinbarrett <collinbarrett@users.noreply.github.com>
Date: Thu, 30 Aug 2018 12:42:43 -0500
Subject: [PATCH] add BarbBlock variants

---
 data/FilterList.json           | 59 +++++++++++++++++++++++++++++++++-
 data/FilterListMaintainer.json | 16 +++++++++
 data/Maintainer.json           |  7 ++++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/data/FilterList.json b/data/FilterList.json
index b15aea335..dbdd411e0 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -3336,7 +3336,7 @@
     "homeUrl": "https://ssl.bblck.me/",
     "issuesUrl": "https://github.com/paulgb/BarbBlock/issues",
     "licenseId": 2,
-    "name": "BarbBlock",
+    "name": "BarbBlock Hosts",
     "policyUrl": null,
     "publishedDate": null,
     "submissionUrl": null,
@@ -9574,5 +9574,62 @@
     "submissionUrl": null,
     "syntaxId": 4,
     "viewUrl": "https://raw.githubusercontent.com/SkeletalDemise/Skeletal-Blocker/master/Skeletal%20Blocker%20List"
+  },
+  {
+    "id": 515,
+    "chatUrl": null,
+    "description": "BarbBlock is a content blocking list with standalone browser extensions for Chrome and Firefox. It blacklists sites which have used DMCA takedowns to force removal from other content blocking lists. Such takedowns are categorically invalid, but they can be effective at intimidating small open-source projects into compliance.",
+    "descriptionSourceUrl": "https://github.com/paulgb/BarbBlock/blob/master/README.md",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://ssl.bblck.me/",
+    "issuesUrl": "https://github.com/paulgb/BarbBlock/issues",
+    "licenseId": 2,
+    "name": "BarbBlock uBlock Origin",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 4,
+    "viewUrl": "https://ssl.bblck.me/blacklists/ublock-origin.txt"
+  },
+  {
+    "id": 516,
+    "chatUrl": null,
+    "description": "BarbBlock is a content blocking list with standalone browser extensions for Chrome and Firefox. It blacklists sites which have used DMCA takedowns to force removal from other content blocking lists. Such takedowns are categorically invalid, but they can be effective at intimidating small open-source projects into compliance.",
+    "descriptionSourceUrl": "https://github.com/paulgb/BarbBlock/blob/master/README.md",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://ssl.bblck.me/",
+    "issuesUrl": "https://github.com/paulgb/BarbBlock/issues",
+    "licenseId": 2,
+    "name": "BarbBlock Domains",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://raw.githubusercontent.com/paulgb/BarbBlock/master/blacklists/domain-list.txt"
+  },
+  {
+    "id": 517,
+    "chatUrl": null,
+    "description": "BarbBlock is a content blocking list with standalone browser extensions for Chrome and Firefox. It blacklists sites which have used DMCA takedowns to force removal from other content blocking lists. Such takedowns are categorically invalid, but they can be effective at intimidating small open-source projects into compliance.",
+    "descriptionSourceUrl": "https://github.com/paulgb/BarbBlock/blob/master/README.md",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://ssl.bblck.me/",
+    "issuesUrl": "https://github.com/paulgb/BarbBlock/issues",
+    "licenseId": 2,
+    "name": "BarbBlock Adblock Plus",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 3,
+    "viewUrl": "https://ssl.bblck.me/blacklists/adblock-plus.txt"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index e7186b36a..ef3deeb1d 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -766,5 +766,21 @@
   {
     "filterListId": 514,
     "maintainerId": 77
+  },
+  {
+    "filterListId": 177,
+    "maintainerId": 78
+  },
+  {
+    "filterListId": 515,
+    "maintainerId": 78
+  },
+  {
+    "filterListId": 516,
+    "maintainerId": 78
+  },
+  {
+    "filterListId": 517,
+    "maintainerId": 78
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index 98a3ad61d..0f0173eb2 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -523,5 +523,12 @@
     "homeUrl": "https://github.com/SkeletalDemise",
     "name": "SkeletalDemise",
     "twitterHandle": null
+  },
+  {
+    "id": 78,
+    "emailAddress": "github@paulbutler.org",
+    "homeUrl": "http://paulbutler.org",
+    "name": "Paul Butler",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file