From 0aaae44b3a8e061a90aba2dfb25bcb73d6749182 Mon Sep 17 00:00:00 2001
From: collinbarrett <collinbarrett@users.noreply.github.com>
Date: Fri, 31 Aug 2018 07:49:32 -0500
Subject: [PATCH] add Chad Mayfield's lists

closes #411
---
 data/FilterList.json             | 38 ++++++++++++++++++++++++++++++++
 data/FilterListMaintainer.json   |  8 +++++++
 data/FilterListTag.json          |  8 +++++++
 data/Maintainer.json             |  7 ++++++
 src/FilterLists.Agent/Program.cs |  2 +-
 5 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/data/FilterList.json b/data/FilterList.json
index b66b5e926..8465380df 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -9764,5 +9764,43 @@
     "submissionUrl": null,
     "syntaxId": 3,
     "viewUrl": "https://raw.githubusercontent.com/CHEF-KOCH/CKs-FilterList/master/CK's-FilterList.txt"
+  },
+  {
+    "id": 525,
+    "chatUrl": null,
+    "description": "This list is a correlated list to only block porn sites that appear on Alex'a top 1m site list.",
+    "descriptionSourceUrl": "https://github.com/chadmayfield/my-pihole-blocklists",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://github.com/chadmayfield/my-pihole-blocklists",
+    "issuesUrl": "https://github.com/chadmayfield/my-pihole-blocklists/issues",
+    "licenseId": 4,
+    "name": "Chad Mayfield's Porn List Light",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_top1m.list"
+  },
+  {
+    "id": 526,
+    "chatUrl": null,
+    "description": "This list is a slightly edited list from Université Toulouse 1 Capitole.",
+    "descriptionSourceUrl": "https://github.com/chadmayfield/my-pihole-blocklists",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://github.com/chadmayfield/my-pihole-blocklists",
+    "issuesUrl": "https://github.com/chadmayfield/my-pihole-blocklists/issues",
+    "licenseId": 4,
+    "name": "Chad Mayfield's Porn List Heavy",
+    "policyUrl": null,
+    "publishedDate": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index 6894d9e36..a11847f01 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -818,5 +818,13 @@
   {
     "filterListId": 524,
     "maintainerId": 61
+  },
+  {
+    "filterListId": 525,
+    "maintainerId": 81
+  },
+  {
+    "filterListId": 526,
+    "maintainerId": 81
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListTag.json b/data/FilterListTag.json
index ffefbfdb8..3dd402f7a 100644
--- a/data/FilterListTag.json
+++ b/data/FilterListTag.json
@@ -478,5 +478,13 @@
   {
     "filterListId": 514,
     "tagId": 3
+  },
+  {
+    "filterListId": 525,
+    "tagId": 11
+  },
+  {
+    "filterListId": 526,
+    "tagId": 11
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index f2486a83a..6cc627a7f 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -544,5 +544,12 @@
     "homeUrl": "https://www.kowabit.de/",
     "name": "kowabit",
     "twitterHandle": null
+  },
+  {
+    "id": 81,
+    "emailAddress": null,
+    "homeUrl": "https://github.com/chadmayfield",
+    "name": "Chad Mayfield",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Program.cs b/src/FilterLists.Agent/Program.cs
index 5ef9656f8..407a8e2c1 100644
--- a/src/FilterLists.Agent/Program.cs
+++ b/src/FilterLists.Agent/Program.cs
@@ -16,7 +16,7 @@ public static class Program
         private static ServiceProvider serviceProvider;
         private static SnapshotService snapshotService;
         private static Logger logger;
-        private static readonly TimeSpan Timeout = TimeSpan.FromHours(6);
+        private static readonly TimeSpan Timeout = TimeSpan.FromHours(12);
 
         public static async Task Main()
         {