Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-27 09:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(deps): update dependency sitemap to v4

Browse Source 
Squashed commit of the following:

commit f4dd9cabb2
Author: Julian Lam <julian@nodebb.org>
Date:   Tue Aug 13 11:33:05 2019 -0400

    fix: resolved breaking changes from sitemap v4 upgrade

commit 9043415ee1
Merge: e3352b272 72590b346
Author: Julian Lam <julian@nodebb.org>
Date:   Tue Aug 13 11:09:55 2019 -0400

    Merge branch 'master' into renovate/sitemap-4.x

commit e3352b272e
Author: Renovate Bot <bot@renovateapp.com>
Date:   Mon Aug 12 07:59:05 2019 +0000

    fix(deps): update dependency sitemap to v4
This commit is contained in:
Julian Lam
2019-08-13 14:14:58 -04:00
parent 7a5dbd9ff5
commit d3d677daf2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -110,7 +110,7 @@
"semver": "^6.0.0", "semver": "^6.0.0",
"serve-favicon": "^2.4.5", "serve-favicon": "^2.4.5",
"sharp": "0.23.0", "sharp": "0.23.0",
"sitemap": "^3.0.0", "sitemap": "^4.0.0",
"socket.io": "2.2.0", "socket.io": "2.2.0",
"socket.io-adapter-cluster": "^1.0.1", "socket.io-adapter-cluster": "^1.0.1",
"socket.io-adapter-mongo": "^2.0.1", "socket.io-adapter-mongo": "^2.0.1",

20
src/sitemap.js
View File

@@ -1,7 +1,7 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var sm = require('sitemap'); const { Sitemap } = require('sitemap');
var nconf = require('nconf'); var nconf = require('nconf');
var db = require('./database'); var db = require('./database');
@@ -45,7 +45,7 @@ sitemap.getPages = function (callback) {
sitemap.maps.pages && sitemap.maps.pages &&
Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10) Date.now() < parseInt(sitemap.maps.pages.cacheSetTimestamp, 10) + parseInt(sitemap.maps.pages.cacheResetPeriod, 10)
) { ) {
return sitemap.maps.pages.toXML(callback); return callback(null, sitemap.maps.pages.toXML());
} }
var urls = [{ var urls = [{
@@ -70,13 +70,13 @@ sitemap.getPages = function (callback) {
if (err) { if (err) {
return callback(err); return callback(err);
} }
sitemap.maps.pages = sm.createSitemap({ sitemap.maps.pages = new Sitemap({
hostname: nconf.get('url'), hostname: nconf.get('url'),
cacheTime: 1000 * 60 * 60 * 24, // Cached for 24 hours cacheTime: 1000 * 60 * 60 * 24, // Cached for 24 hours
urls: data.urls, urls: data.urls,
}); });
sitemap.maps.pages.toXML(callback); callback(null, sitemap.maps.pages.toXML());
}); });
}; };
@@ -85,7 +85,7 @@ sitemap.getCategories = function (callback) {
sitemap.maps.categories && sitemap.maps.categories &&
Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10) Date.now() < parseInt(sitemap.maps.categories.cacheSetTimestamp, 10) + parseInt(sitemap.maps.categories.cacheResetPeriod, 10)
) { ) {
return sitemap.maps.categories.toXML(callback); return callback(null, sitemap.maps.categories.toXML());
} }
var categoryUrls = []; var categoryUrls = [];
@@ -104,13 +104,13 @@ sitemap.getCategories = function (callback) {
} }
}); });
sitemap.maps.categories = sm.createSitemap({ sitemap.maps.categories = new Sitemap({
hostname: nconf.get('url'), hostname: nconf.get('url'),
cacheTime: 1000 * 60 * 60 * 24, // Cached for 24 hours cacheTime: 1000 * 60 * 60 * 24, // Cached for 24 hours
urls: categoryUrls, urls: categoryUrls,
}); });
sitemap.maps.categories.toXML(callback); callback(null, sitemap.maps.categories.toXML());
}); });
}; };
@@ -127,7 +127,7 @@ sitemap.getTopicPage = function (page, callback) {
sitemap.maps.topics[page - 1] && sitemap.maps.topics[page - 1] &&
Date.now() < parseInt(sitemap.maps.topics[page - 1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page - 1].cacheResetPeriod, 10) Date.now() < parseInt(sitemap.maps.topics[page - 1].cacheSetTimestamp, 10) + parseInt(sitemap.maps.topics[page - 1].cacheResetPeriod, 10)
) { ) {
return sitemap.maps.topics[page - 1].toXML(callback); return callback(null, sitemap.maps.topics[page - 1].toXML());
} }
var topicUrls = []; var topicUrls = [];
@@ -158,13 +158,13 @@ sitemap.getTopicPage = function (page, callback) {
} }
}); });
sitemap.maps.topics[page - 1] = sm.createSitemap({ sitemap.maps.topics[page - 1] = new Sitemap({
hostname: nconf.get('url'), hostname: nconf.get('url'),
cacheTime: 1000 * 60 * 60, // Cached for 1 hour cacheTime: 1000 * 60 * 60, // Cached for 1 hour
urls: topicUrls, urls: topicUrls,
}); });
sitemap.maps.topics[page - 1].toXML(callback); callback(null, sitemap.maps.topics[page - 1].toXML());
}); });
}; };