Node.js based forum software built for the modern web
feat: closes #13968, add sitemap cache duration
Barış Soner Uşaklıfe35ad4f47fa
diff --git a/install/data/defaults.json b/install/data/defaults.jsonindex 5b1f91eeb7..449234192c 100644--- a/install/data/defaults.json+++ b/install/data/defaults.json@@ -142,6 +142,7 @@"feeds:disableSitemap": 0,"feeds:disableRSS": 0,"sitemapTopics": 500,+ "sitemapCacheDurationHours": 24,"maintenanceMode": 0,"maintenanceModeStatus": 503,"upvoteVisibility": "all",diff --git a/public/language/en-GB/admin/settings/web-crawler.json b/public/language/en-GB/admin/settings/web-crawler.jsonindex 2e0d31d12b..b398d764ba 100644--- a/public/language/en-GB/admin/settings/web-crawler.json+++ b/public/language/en-GB/admin/settings/web-crawler.json@@ -5,6 +5,7 @@"disable-rss-feeds": "Disable RSS Feeds","disable-sitemap-xml": "Disable Sitemap.xml","sitemap-topics": "Number of Topics to display in the Sitemap",+ "sitemap-cache-duration-hours": "Sitemap Cache Duration (hours)","clear-sitemap-cache": "Clear Sitemap Cache","view-sitemap": "View Sitemap"}\ No newline at end of filediff --git a/src/sitemap.js b/src/sitemap.jsindex 6e17514352..2260c9b466 100644--- a/src/sitemap.js+++ b/src/sitemap.js@@ -60,6 +60,10 @@ async function getSitemapPages() {return data.urls;}+function getCacheExpireTimestamp() {+ return Date.now() + (1000 * 60 * 60 * (meta.config.sitemapCacheDurationHours || 24));+}+sitemap.getPages = async function () {if (sitemap.maps.pages && Date.now() < sitemap.maps.pagesCacheExpireTimestamp) {return sitemap.maps.pages;@@ -68,12 +72,12 @@ sitemap.getPages = async function () {const urls = await getSitemapPages();if (!urls.length) {sitemap.maps.pages = '';- sitemap.maps.pagesCacheExpireTimestamp = Date.now() + (1000 * 60 * 60 * 24);+ sitemap.maps.pagesCacheExpireTimestamp = getCacheExpireTimestamp();return sitemap.maps.pages;}sitemap.maps.pages = await urlsToSitemap(urls);- sitemap.maps.pagesCacheExpireTimestamp = Date.now() + (1000 * 60 * 60 * 24);+ sitemap.maps.pagesCacheExpireTimestamp = getCacheExpireTimestamp();return sitemap.maps.pages;};@@ -105,12 +109,12 @@ sitemap.getCategories = async function () {if (!categoryUrls.length) {sitemap.maps.categories = '';- sitemap.maps.categoriesCacheExpireTimestamp = Date.now() + (1000 * 60 * 60 * 24);+ sitemap.maps.categoriesCacheExpireTimestamp = getCacheExpireTimestamp();return sitemap.maps.categories;}sitemap.maps.categories = await urlsToSitemap(categoryUrls);- sitemap.maps.categoriesCacheExpireTimestamp = Date.now() + (1000 * 60 * 60 * 24);+ sitemap.maps.categoriesCacheExpireTimestamp = getCacheExpireTimestamp();return sitemap.maps.categories;};@@ -140,7 +144,7 @@ sitemap.getTopicPage = async function (page) {if (!data.topics.length) {sitemap.maps.topics[page - 1] = {sm: '',- cacheExpireTimestamp: Date.now() + (1000 * 60 * 60 * 24),+ cacheExpireTimestamp: getCacheExpireTimestamp(),};return sitemap.maps.topics[page - 1].sm;}@@ -158,7 +162,7 @@ sitemap.getTopicPage = async function (page) {sitemap.maps.topics[page - 1] = {sm: await urlsToSitemap(topicUrls),- cacheExpireTimestamp: Date.now() + (1000 * 60 * 60 * 24),+ cacheExpireTimestamp: getCacheExpireTimestamp(),};return sitemap.maps.topics[page - 1].sm;diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tplindex ebb51d728d..e2be849fec 100644--- a/src/views/admin/settings/web-crawler.tpl+++ b/src/views/admin/settings/web-crawler.tpl@@ -30,6 +30,11 @@<input id="sitemapTopics" class="form-control" type="text" data-field="sitemapTopics" /></div>+ <div class="mb-3">+ <label class="form-label" for="sitemapCacheDurationHours">[[admin/settings/web-crawler:sitemap-cache-duration-hours]]</label>+ <input id="sitemapCacheDurationHours" class="form-control" type="text" data-field="sitemapCacheDurationHours" />+ </div>+<p><button id="clear-sitemap-cache" class="btn btn-sm btn-warning">[[admin/settings/web-crawler:clear-sitemap-cache]]</button><a href="{config.relative_path}/sitemap.xml" target="_blank" class="btn btn-sm btn-light">[[admin/settings/web-crawler:view-sitemap]]</a>