diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b793bc928..b053f14578 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,54 @@ +#### v2.8.6 (2023-02-03) + +##### Chores + +* **i18n:** fallback strings for new resources: nodebb.error (8335f90a) +* incrementing version number - v2.8.5 (bff5ce2d) +* update changelog for v2.8.5 (24e58c28) +* incrementing version number - v2.8.4 (a46b2bbc) +* incrementing version number - v2.8.3 (c20b20a7) +* incrementing version number - v2.8.2 (050e43f8) +* incrementing version number - v2.8.1 (727f879e) +* incrementing version number - v2.8.0 (8e77673d) +* incrementing version number - v2.7.0 (96cc0617) +* incrementing version number - v2.6.1 (7e52a7a5) +* incrementing version number - v2.6.0 (e7fcf482) +* incrementing version number - v2.5.8 (dec0e7de) +* incrementing version number - v2.5.7 (5836bf4a) +* incrementing version number - v2.5.6 (c7bd7dbf) +* incrementing version number - v2.5.5 (3509ed94) +* incrementing version number - v2.5.4 (e83260ca) +* incrementing version number - v2.5.3 (7e922936) +* incrementing version number - v2.5.2 (babcd17e) +* incrementing version number - v2.5.1 (ce3aa950) +* incrementing version number - v2.5.0 (01d276cb) +* incrementing version number - v2.4.5 (dd3e1a28) +* incrementing version number - v2.4.4 (d5525c87) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) + +##### New Features + +* add sitemap filter hooks for categories/topic pages (bf92ee0e) +* closes #11241, add missing error lang keys (c241baf6) +* #11240, only show relevant users in flags assignee list (0713482b) + +##### Bug Fixes + +* #11254, return check for reroll property (202378b9) +* closes #11249, notification uses displayname (705cd13a) +* wrong link to topics in acp dashboard (b5598a6e) +* https://github.com/NodeBB/NodeBB/issues/11239 (1d3c0e5a) +* notif filter selecte field (6d819b05) + +##### Other Changes + +* remove unused (d68352cc) + #### v2.8.5 (2023-01-27) ##### Chores diff --git a/install/package.json b/install/package.json index ca5eec707e..8ccf83606d 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.8.5", + "version": "2.8.6", "homepage": "http://www.nodebb.org", "repository": { "type": "git", diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 9febe062a8..934fdec80e 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -154,7 +154,7 @@ Auth.reloadRoutes = async function (params) { }, Auth.middleware.validateAuth, (req, res, next) => { async.waterfall([ async.apply(req.login.bind(req), res.locals.user, { keepSessionInfo: true }), - async.apply(controllers.authentication.onSuccessfulLogin, req, req.uid), + async.apply(controllers.authentication.onSuccessfulLogin, req, res.locals.user.uid), ], (err) => { if (err) { return next(err); diff --git a/src/sitemap.js b/src/sitemap.js index 353ed23f43..6e17514352 100644 --- a/src/sitemap.js +++ b/src/sitemap.js @@ -79,7 +79,11 @@ sitemap.getPages = async function () { async function getSitemapCategories() { const cids = await categories.getCidsByPrivilege('categories:cid', 0, 'find'); - return await categories.getCategoriesFields(cids, ['slug']); + const categoryData = await categories.getCategoriesFields(cids, ['slug']); + const data = await plugins.hooks.fire('filter:sitemap.getCategories', { + categories: categoryData, + }); + return data.categories; } sitemap.getCategories = async function () { @@ -128,7 +132,12 @@ sitemap.getTopicPage = async function (page) { tids = await privileges.topics.filterTids('topics:read', tids, 0); const topicData = await topics.getTopicsFields(tids, ['tid', 'title', 'slug', 'lastposttime']); - if (!topicData.length) { + const data = await plugins.hooks.fire('filter:sitemap.getCategories', { + page: page, + topics: topicData, + }); + + if (!data.topics.length) { sitemap.maps.topics[page - 1] = { sm: '', cacheExpireTimestamp: Date.now() + (1000 * 60 * 60 * 24), @@ -136,7 +145,7 @@ sitemap.getTopicPage = async function (page) { return sitemap.maps.topics[page - 1].sm; } - topicData.forEach((topic) => { + data.topics.forEach((topic) => { if (topic) { topicUrls.push({ url: `${nconf.get('relative_path')}/topic/${topic.slug}`,