From 0f7e362a2da09bc14c36f793d1917f1d47d98227 Mon Sep 17 00:00:00 2001 From: Kowith Singkornkeeree Date: Sat, 17 Nov 2018 15:16:23 +0000 Subject: [PATCH 1/4] add Facebook Zero Hosts Block, misc. data updates (#625) - Add 2 hosts from #616 - Update Mirror - Re-Sort e6e46f6e01da1eeb6d271b0c7613b66084212954 closes #616 --- data/FilterList.json | 128 +++++++++++++++++++++------------ data/FilterListMaintainer.json | 8 +++ data/FilterListTag.json | 24 +++++++ 3 files changed, 114 insertions(+), 46 deletions(-) diff --git a/data/FilterList.json b/data/FilterList.json index 44ef6ee84..8a9140531 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -4063,7 +4063,8 @@ "publishedDate": "2017-05-12T13:34:17", "syntaxId": 1, "updatedDate": "2018-10-23T13:23:40", - "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiConsentHosts/master/ThaiConsentHosts.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiConsentHosts/master/ThaiConsentHosts.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/ThaiConsentHosts/raw/master/ThaiConsentHosts.txt" }, { "id": 331, @@ -4076,7 +4077,8 @@ "publishedDate": "2016-01-09T17:08:54", "syntaxId": 4, "updatedDate": "2018-10-30T05:36:45", - "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiParanoidBlock/master/ThaiParanoid.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiParanoidBlock/master/ThaiParanoid.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/ThaiParanoidBlock/raw/master/ThaiParanoid.txt" }, { "id": 332, @@ -5955,42 +5957,6 @@ "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/formats/ext-porn-hosts", "viewUrlMirror1": "https://energized.pro/exts/porn-lite" }, - { - "id": 864, - "chatUrl": "https://t.me/EnergizedProtection", - "description": "Energized Xtreme Blocking.", - "descriptionSourceUrl": "https://github.com/EnergizedProtection/block", - "donateUrl": "https://energized.pro/support", - "emailAddress": "mail@energized.pro", - "forumUrl": "http://go.energized.pro/xda", - "homeUrl": "https://energized.pro", - "issuesUrl": "https://github.com/EnergizedProtection/block/issues", - "licenseId": 9, - "name": "Energized Xtreme Protection - Extension", - "submissionUrl": "https://app.energized.pro", - "syntaxId": 1, - "updatedDate": "2018-09-21T04:16:43", - "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/formats/ext-porn-hosts", - "viewUrlMirror1": "https://energized.pro/exts/xtreme" - }, - { - "id": 865, - "chatUrl": "https://t.me/EnergizedProtection", - "description": "Energized Regional Blocking.", - "descriptionSourceUrl": "https://github.com/EnergizedProtection/block", - "donateUrl": "https://energized.pro/support", - "emailAddress": "mail@energized.pro", - "forumUrl": "http://go.energized.pro/xda", - "homeUrl": "https://energized.pro", - "issuesUrl": "https://github.com/EnergizedProtection/block/issues", - "licenseId": 9, - "name": "Energized Regional Protection - Extension", - "submissionUrl": "https://app.energized.pro", - "syntaxId": 1, - "updatedDate": "2018-09-21T04:16:43", - "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/formats/ext-porn-hosts", - "viewUrlMirror1": "https://energized.pro/exts/regional" - }, { "id": 490, "homeUrl": "https://github.com/CyanideBrother/anti-pr0n", @@ -7182,7 +7148,8 @@ "publishedDate": "2016-01-04T00:00:00", "syntaxId": 4, "updatedDate": "2018-10-05T10:19:31", - "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiAntiTokenSites/master/AntiPumpSites.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiAntiTokenSites/master/AntiPumpSites.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/ThaiAntiTokenSites/raw/master/AntiPumpSites.txt" }, { "id": 602, @@ -7194,7 +7161,8 @@ "publishedDate": "2016-01-04T00:00:00", "syntaxId": 1, "updatedDate": "2018-10-13T17:01:49", - "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiAntiTokenSites/master/AntiPumpSites_hosts.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiAntiTokenSites/master/AntiPumpSites_hosts.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/ThaiAntiTokenSites/raw/master/AntiPumpSites_hosts.txt" }, { "id": 603, @@ -8628,7 +8596,8 @@ "publishedDate": "2018-09-27T13:46:05", "syntaxId": 4, "updatedDate": "2018-10-31T05:11:18", - "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/imageboard/GelboLube.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/imageboard/GelboLube.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/imageboard/GelboLube.txt" }, { "id": 735, @@ -8640,7 +8609,8 @@ "publishedDate": "2018-09-26T14:26:24", "syntaxId": 4, "updatedDate": "2018-10-01T08:47:49", - "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/specific/AntiAPKMirrorCountdown.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/specific/AntiAPKMirrorCountdown.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/specific/AntiAPKMirrorCountdown.txt" }, { "id": 736, @@ -9851,7 +9821,8 @@ "publishedDate": "2018-09-26T14:26:24", "syntaxId": 4, "updatedDate": "2018-11-01T03:01:39", - "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/facebook/FacebookZuckestionKiller.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/facebook/FacebookZuckestionKiller.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/facebook/FacebookZuckestionKiller.txt" }, { "id": 844, @@ -9864,7 +9835,8 @@ "publishedDate": "2018-09-26T14:26:24", "syntaxId": 4, "updatedDate": "2018-10-17T18:29:56", - "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/facebook/FacebookCommands.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/filterlist/facebook/FacebookCommands.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/filterlist/facebook/FacebookCommands.txt" }, { "id": 845, @@ -9876,7 +9848,8 @@ "publishedDate": "2018-07-13T11:10:35", "syntaxId": 1, "updatedDate": "2018-07-13T11:10:35", - "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/hosts/hosts_google_adservice_id.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/hosts/hosts_google_adservice_id.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/hosts/hosts_google_adservice_id.txt" }, { "id": 846, @@ -9889,7 +9862,8 @@ "publishedDate": "2016-01-09T17:08:54", "syntaxId": 4, "updatedDate": "2018-10-30T05:36:45", - "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiParanoidBlock/maximum/ThaiParanoid.txt" + "viewUrl": "https://raw.githubusercontent.com/kowith337/ThaiParanoidBlock/maximum/ThaiParanoid.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/ThaiParanoidBlock/raw/maximum/ThaiParanoid.txt" }, { "id": 847, @@ -10145,5 +10119,67 @@ "viewUrl": "https://raw.githubusercontent.com/DandelionSprout/adfilt/master/Anti-'Christmas%20carols'%20List.txt", "viewUrlMirror1": "https://repo.or.cz/FilterMirrorRepo.git/blob_plain/refs/heads/master:/Anti-'Christmas%20carols'%20List.txt", "viewUrlMirror2": "https://notabug.org/DandelionSprout/FilterMirrorRepo2/raw/master/Anti-'Christmas%20carols'%20List.txt" + }, + { + "id": 864, + "chatUrl": "https://t.me/EnergizedProtection", + "description": "Energized Xtreme Blocking.", + "descriptionSourceUrl": "https://github.com/EnergizedProtection/block", + "donateUrl": "https://energized.pro/support", + "emailAddress": "mail@energized.pro", + "forumUrl": "http://go.energized.pro/xda", + "homeUrl": "https://energized.pro", + "issuesUrl": "https://github.com/EnergizedProtection/block/issues", + "licenseId": 9, + "name": "Energized Xtreme Protection - Extension", + "submissionUrl": "https://app.energized.pro", + "syntaxId": 1, + "updatedDate": "2018-09-21T04:16:43", + "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/formats/ext-porn-hosts", + "viewUrlMirror1": "https://energized.pro/exts/xtreme" + }, + { + "id": 865, + "chatUrl": "https://t.me/EnergizedProtection", + "description": "Energized Regional Blocking.", + "descriptionSourceUrl": "https://github.com/EnergizedProtection/block", + "donateUrl": "https://energized.pro/support", + "emailAddress": "mail@energized.pro", + "forumUrl": "http://go.energized.pro/xda", + "homeUrl": "https://energized.pro", + "issuesUrl": "https://github.com/EnergizedProtection/block/issues", + "licenseId": 9, + "name": "Energized Regional Protection - Extension", + "submissionUrl": "https://app.energized.pro", + "syntaxId": 1, + "updatedDate": "2018-09-21T04:16:43", + "viewUrl": "https://raw.githubusercontent.com/EnergizedProtection/block/master/extensions/formats/ext-porn-hosts", + "viewUrlMirror1": "https://energized.pro/exts/regional" + }, + { + "id": 866, + "description": "This aim to block non-formal hosts that serve all Facebook contents and resources from alternative \"Free Basics\" servers that it happen when you're using on mobile data over the carrier that collaborate with Facebook to have THAT service! Note that all rules are have many duplicates and didn't checked how many servers or domains really exists.", + "descriptionSourceUrl": "https://github.com/kowith337/PersonalFilterListCollection/blob/master/hosts/readme.md", + "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", + "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=label%3A%22Hosts+File%22", + "licenseId": 13, + "name": "Facebook Zero Hosts Block", + "publishedDate": "2018-11-04T12:51:35", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/hosts/hosts_facebook0.txt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/hosts/hosts_facebook0.txt" + }, + { + "id": 867, + "description": "This aim to block non-formal hosts that serve all Facebook contents and resources from alternative \"Free Basics\" servers that it happen when you're using on mobile data over the carrier that collaborate with Facebook to have THAT service! NoEdge version is split from main version that aim to support low to mid end devices that cannot combine or merge too much hosts file rules.", + "descriptionSourceUrl": "https://github.com/kowith337/PersonalFilterListCollection/blob/master/hosts/readme.md", + "homeUrl": "https://github.com/kowith337/PersonalFilterListCollection", + "issuesUrl": "https://github.com/kowith337/PersonalFilterListCollection/issues?q=label%3A%22Hosts+File%22", + "licenseId": 13, + "name": "Facebook Zero Hosts Block (NoEdge)", + "publishedDate": "2018-11-13T14:07:15", + "syntaxId": 1, + "viewUrl": "https://raw.githubusercontent.com/kowith337/PersonalFilterListCollection/master/hosts/hosts_facebook0_noedgetxt", + "viewUrlMirror1": "https://gitlab.com/kowith337/PersonalFilterListCollection/raw/master/hosts/hosts_facebook0_noedge.txt" } ] diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 0497c1fda..120cf53c0 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -979,6 +979,14 @@ "filterListId": 862, "maintainerId": 38 }, + { + "filterListId": 866, + "maintainerId": 38 + }, + { + "filterListId": 867, + "maintainerId": 38 + }, { "filterListId": 333, "maintainerId": 39 diff --git a/data/FilterListTag.json b/data/FilterListTag.json index a8a376fd9..10b5bda41 100644 --- a/data/FilterListTag.json +++ b/data/FilterListTag.json @@ -4002,5 +4002,29 @@ { "filterListId": 865, "tagId": 3 + }, + { + "filterListId": 866, + "tagId": 3 + }, + { + "filterListId": 866, + "tagId": 4 + }, + { + "filterListId": 866, + "tagId": 19 + }, + { + "filterListId": 867, + "tagId": 3 + }, + { + "filterListId": 867, + "tagId": 4 + }, + { + "filterListId": 867, + "tagId": 19 } ] From 9fa50ab13790a66b8bad95ae46850d1707c18af9 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 17 Nov 2018 09:43:15 -0600 Subject: [PATCH 2/4] update nugets --- src/FilterLists.Api/FilterLists.Api.csproj | 4 ++-- src/FilterLists.Services/FilterLists.Services.csproj | 2 +- src/FilterLists.Web/FilterLists.Web.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FilterLists.Api/FilterLists.Api.csproj b/src/FilterLists.Api/FilterLists.Api.csproj index f98465816..265c0130a 100644 --- a/src/FilterLists.Api/FilterLists.Api.csproj +++ b/src/FilterLists.Api/FilterLists.Api.csproj @@ -39,10 +39,10 @@ - + - + diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj index 357c5363a..c8c084280 100644 --- a/src/FilterLists.Services/FilterLists.Services.csproj +++ b/src/FilterLists.Services/FilterLists.Services.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/FilterLists.Web/FilterLists.Web.csproj b/src/FilterLists.Web/FilterLists.Web.csproj index 99a67d2d6..309f26f94 100644 --- a/src/FilterLists.Web/FilterLists.Web.csproj +++ b/src/FilterLists.Web/FilterLists.Web.csproj @@ -24,7 +24,7 @@ - + From 3591648d05fa74cb5f5b2a2fa1f0b19eac2b3221 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 17 Nov 2018 09:48:51 -0600 Subject: [PATCH 3/4] update npm packages --- src/FilterLists.Web/npm-shrinkwrap.json | 46 ++++++++++++------------- src/FilterLists.Web/package.json | 12 +++---- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/FilterLists.Web/npm-shrinkwrap.json b/src/FilterLists.Web/npm-shrinkwrap.json index 2e7eee673..ef8e02182 100644 --- a/src/FilterLists.Web/npm-shrinkwrap.json +++ b/src/FilterLists.Web/npm-shrinkwrap.json @@ -22,9 +22,9 @@ "integrity": "sha512-ZBFR7TROLVzCkswA3Fmqq+IIJt62/T7aY/Dmz+QkU7CaW2QFqAitCE8Ups7IzmGhcN1YWMBT4Qcoc07jU9hOJQ==" }, "@types/react": { - "version": "16.4.18", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.4.18.tgz", - "integrity": "sha512-eFzJKEg6pdeaukVLVZ8Xb79CTl/ysX+ExmOfAAqcFlCCK5TgFDD9kWR0S18sglQ3EmM8U+80enjUqbfnUyqpdA==", + "version": "16.7.6", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.6.tgz", + "integrity": "sha512-QBUfzftr/8eg/q3ZRgf/GaDP6rTYc7ZNem+g4oZM38C9vXyV8AWRWaTQuW5yCoZTsfHrN7b3DeEiUnqH9SrnpA==", "requires": { "@types/prop-types": "*", "csstype": "^2.2.0" @@ -51,9 +51,9 @@ } }, "@types/react-router": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.4.0.tgz", - "integrity": "sha512-b16Fpy4nsxC4Ntu72+VAl0kYd1qrT8M5aRGBJ0D4RoY5QeGaA5VguPWu1If2+g2dLNvb8A4vAMQAcDgYdQ4L9w==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.4.1.tgz", + "integrity": "sha512-CtQfdcXyMye3vflnQQ2sHU832iDJRoAr4P+7f964KlLYupXU1I5crP1+d/WnCMo6mmtjBjqQvxrtbAbodqerMA==", "dev": true, "requires": { "@types/history": "*", @@ -72,9 +72,9 @@ } }, "@types/react-table": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.7.14.tgz", - "integrity": "sha512-qUw1aRPQ1Lxsygjf7AadLEm3qG2H9t2ly6LUIDGfkds0i5MQEVvAQ1dCT66i27XS7ek1W1RaiyeJxQJ6IvsVYw==", + "version": "6.7.16", + "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.7.16.tgz", + "integrity": "sha512-vdjnU3BxnFf/D0trv6z/knKwz3PQslGoijMcBu2ruHPAnd5E5uayA3R6q2rIfnycoeLxcfW291Hyd5CA8HS5xg==", "requires": { "@types/react": "*" } @@ -4080,9 +4080,9 @@ "dev": true }, "popper.js": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", - "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=" + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.5.tgz", + "integrity": "sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw==" }, "posix-character-classes": { "version": "0.1.1", @@ -4786,27 +4786,27 @@ } }, "react": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.6.0.tgz", - "integrity": "sha512-zJPnx/jKtuOEXCbQ9BKaxDMxR0001/hzxXwYxG8septeyYGfsgAei6NgfbVgOhbY1WOP2o3VPs/E9HaN+9hV3Q==", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react/-/react-16.6.3.tgz", + "integrity": "sha512-zCvmH2vbEolgKxtqXL2wmGCUxUyNheYn/C+PD1YAjfxHC54+MhdruyhO7QieQrYsYeTxrn93PM2y0jRH1zEExw==", "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.2" } }, "react-dom": { - "version": "16.6.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.0.tgz", - "integrity": "sha512-Stm2D9dXEUUAQdvpvhvFj/DEXwC2PAL/RwEMhoN4dvvD2ikTlJegEXf97xryg88VIAU22ZAP7n842l+9BTz6+w==", + "version": "16.6.3", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.6.3.tgz", + "integrity": "sha512-8ugJWRCWLGXy+7PmNh8WJz3g1TaTUt1XyoIcFN+x0Zbkoz+KKdUyx1AQLYJdbFXjuF41Nmjn5+j//rxvhFjgSQ==", "dev": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.10.0" + "scheduler": "^0.11.2" } }, "react-hot-loader": { @@ -5086,9 +5086,9 @@ "dev": true }, "scheduler": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.10.0.tgz", - "integrity": "sha512-+TSTVTCBAA3h8Anei3haDc1IRwMeDmtI/y/o3iBe3Mjl2vwYF9DtPDt929HyRmV/e7au7CLu8sc4C4W0VOs29w==", + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.11.2.tgz", + "integrity": "sha512-+WCP3s3wOaW4S7C1tl3TEXp4l9lJn0ZK8G3W3WKRWmw77Z2cIFUW2MiNTMHn5sCjxN+t7N43HAOOgMjyAg5hlg==", "dev": true, "requires": { "loose-envify": "^1.1.0", diff --git a/src/FilterLists.Web/package.json b/src/FilterLists.Web/package.json index 91208726c..46d198f8d 100644 --- a/src/FilterLists.Web/package.json +++ b/src/FilterLists.Web/package.json @@ -4,10 +4,10 @@ "version": "0.0.0", "devDependencies": { "@types/history": "^4.7.2", - "@types/react": "^16.4.18", + "@types/react": "^16.7.6", "@types/react-dom": "^16.0.9", "@types/react-hot-loader": "^4.1.0", - "@types/react-router": "^4.4.0", + "@types/react-router": "^4.4.1", "@types/react-router-dom": "^4.3.1", "@types/webpack-env": "^1.13.6", "aspnet-webpack": "^3.0.0", @@ -19,8 +19,8 @@ "extract-text-webpack-plugin": "^3.0.2", "isomorphic-fetch": "^2.2.1", "jquery": "^3.3.1", - "react": "^16.6.0", - "react-dom": "^16.6.0", + "react": "^16.6.3", + "react-dom": "^16.6.3", "react-hot-loader": "^4.3.12", "react-router-dom": "^4.3.1", "style-loader": "^0.23.1", @@ -29,9 +29,9 @@ "webpack": "^3.11.0" }, "dependencies": { - "@types/react-table": "^6.7.14", + "@types/react-table": "^6.7.16", "moment": "^2.22.2", - "popper.js": "^1.14.4", + "popper.js": "^1.14.5", "react-table": "^6.8.6" } } From 58972d4a81ab789627374365826596ae772879ca Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sat, 17 Nov 2018 10:06:24 -0600 Subject: [PATCH 4/4] bump cache up to 24 hours --- src/FilterLists.Api/V1/Controllers/BaseController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FilterLists.Api/V1/Controllers/BaseController.cs b/src/FilterLists.Api/V1/Controllers/BaseController.cs index 7222483e4..2bcceb414 100644 --- a/src/FilterLists.Api/V1/Controllers/BaseController.cs +++ b/src/FilterLists.Api/V1/Controllers/BaseController.cs @@ -10,10 +10,10 @@ namespace FilterLists.Api.V1.Controllers [ApiVersion("1.0")] //TODO: use versioning without needing to manually specify in swagger-ui (https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/370) [Route("v{version:apiVersion}/[controller]")] - [ResponseCache(Duration = 3600)] + [ResponseCache(Duration = 86400)] public abstract class BaseController : Controller { - private static readonly TimeSpan MemoryCacheExpirationDefault = TimeSpan.FromHours(1); + private static readonly TimeSpan MemoryCacheExpirationDefault = TimeSpan.FromHours(24); protected readonly SeedService SeedService; private readonly IMemoryCache memoryCache;