diff --git a/CHANGELOG.md b/CHANGELOG.md index b053f14578..6feab404d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,149 @@ +#### v2.8.9 (2023-03-19) + +##### Chores + +* up cron (73a50d17) +* incrementing version number - v2.8.8 (b331b942) +* update changelog for v2.8.8 (c03d5db7) +* incrementing version number - v2.8.7 (3f8248d6) +* incrementing version number - v2.8.6 (af6ce447) +* incrementing version number - v2.8.5 (bff5ce2d) +* 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) + +##### Bug Fixes + +* thumb remove on windows, closes #11357 (767c1d1f) +* #11357 clear cache on thumb remove (a3a38e4b) +* closes #11352, try/catch rss feeds (cfd50272) +* closes #11343, don't crash if tags array is empty (56427e4f) + +##### Code Style Changes + +* more fixes (93aa43f7) + +##### Tests + +* openapi for thumbs (9e685e65) + +#### v2.8.8 (2023-03-09) + +##### Chores + +* incrementing version number - v2.8.7 (3f8248d6) +* update changelog for v2.8.7 (2ca38e7b) +* incrementing version number - v2.8.6 (af6ce447) +* incrementing version number - v2.8.5 (bff5ce2d) +* 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) + +##### Bug Fixes + +* stop topic navigation hotkeys from firing if in a mousetrap-enabled form element (22fc8fe3) +* stop topic navigation hotkeys from firing if in a mousetrap-enabled form element (17d0b40e) +* tag filtering when changing filter to watched topics (1545223e) +* get cid from pid instead of passing in (f054a4f4) +* closes #11331, allow 0 length content if set to 0 in acp (8c762d32) + +#### v2.8.7 (2023-03-01) + +##### Chores + +* incrementing version number - v2.8.6 (af6ce447) +* update changelog for v2.8.6 (f3306d03) +* incrementing version number - v2.8.5 (bff5ce2d) +* 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) + +##### Documentation Changes + +* update openapi spec to include info about passing in timestamps for topic creation, removing timestamp as valid request param for topic replying (40e7b86d) + +##### Bug Fixes + +* display 25 topics on category feed (79155109) +* object destructuring overwriting type parameter (ec58700f) +* alert on page load (8cf4a6f6) +* show error alert if password change fails (3bd9a871) +* update main post timestamp when rescheduling (edd2fc38) +* show admins/globalmods if content is purged (326b9268) +* email expiry timestamps (e335d0f6) +* #11259, clean old emails when updating via admin (#11260) (845c8013) +* #11257, onSuccessfulLogin called with improper uid (7a5bcc21) + +##### Tests + +* add dummy emailer hook in authentication test (1b29dbb6) + #### v2.8.6 (2023-02-03) ##### Chores diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js index 9a42771e4a..8873e4525b 100644 --- a/public/src/client/topic/postTools.js +++ b/public/src/client/topic/postTools.js @@ -45,7 +45,7 @@ define('forum/topic/postTools', [ const pid = postEl.attr('data-pid'); const index = parseInt(postEl.attr('data-index'), 10); - socket.emit('posts.loadPostTools', { pid: pid, cid: ajaxify.data.cid }, async (err, data) => { + socket.emit('posts.loadPostTools', { pid: pid }, async (err, data) => { if (err) { return alerts.error(err); } diff --git a/src/api/users.js b/src/api/users.js index 249eaae83c..9b37d84c2f 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -677,6 +677,10 @@ usersAPI.getExportByType = async (caller, { uid, type }) => { }; usersAPI.generateExport = async (caller, { uid, type }) => { + const validTypes = ['profile', 'posts', 'uploads']; + if (!validTypes.includes(type)) { + throw new Error('[[error:invalid-data]]'); + } const count = await db.incrObjectField('locks', `export:${uid}${type}`); if (count > 1) { throw new Error('[[error:already-exporting]]'); diff --git a/src/cli/index.js b/src/cli/index.js index b05868f3f1..9f0af71030 100644 --- a/src/cli/index.js +++ b/src/cli/index.js @@ -32,12 +32,6 @@ try { if (!semver.satisfies(version, defaultPackage.dependencies[packageName])) { const e = new TypeError(`Incorrect dependency version: ${packageName}`); e.code = 'DEP_WRONG_VERSION'; - // delete the module from require cache so it doesn't break rest of the upgrade - // https://github.com/NodeBB/NodeBB/issues/11173 - const resolvedModule = require.resolve(packageName); - if (require.cache[resolvedModule]) { - delete require.cache[resolvedModule]; - } throw e; } }; @@ -57,6 +51,16 @@ try { packageInstall.preserveExtraneousPlugins(); packageInstall.installAll(); + // delete the module from require cache so it doesn't break rest of the upgrade + // https://github.com/NodeBB/NodeBB/issues/11173 + const packages = ['nconf', 'async', 'commander', 'chalk', 'lodash', 'lru-cache']; + packages.forEach((packageName) => { + const resolvedModule = require.resolve(packageName); + if (require.cache[resolvedModule]) { + delete require.cache[resolvedModule]; + } + }); + const chalk = require('chalk'); console.log(`${chalk.green('OK')}\n`); } else { diff --git a/src/database/mongo/sorted/union.js b/src/database/mongo/sorted/union.js index 7fd997da1e..d70deab889 100644 --- a/src/database/mongo/sorted/union.js +++ b/src/database/mongo/sorted/union.js @@ -26,7 +26,7 @@ module.exports = function (module) { async function getSortedSetUnion(params) { if (!Array.isArray(params.sets) || !params.sets.length) { - return; + return []; } let limit = params.stop - params.start + 1; if (limit <= 0) { diff --git a/src/database/postgres/sorted/union.js b/src/database/postgres/sorted/union.js index a8fcbd0d0d..9d671ceb0f 100644 --- a/src/database/postgres/sorted/union.js +++ b/src/database/postgres/sorted/union.js @@ -32,6 +32,9 @@ SELECT COUNT(DISTINCT z."value") c async function getSortedSetUnion(params) { const { sets } = params; + if (!sets || !sets.length) { + return []; + } const start = params.hasOwnProperty('start') ? params.start : 0; const stop = params.hasOwnProperty('stop') ? params.stop : -1; let weights = params.weights || []; diff --git a/src/routes/feeds.js b/src/routes/feeds.js index fbd8de7072..c4a1c2d9f2 100644 --- a/src/routes/feeds.js +++ b/src/routes/feeds.js @@ -9,11 +9,12 @@ const topics = require('../topics'); const user = require('../user'); const categories = require('../categories'); const meta = require('../meta'); -const helpers = require('../controllers/helpers'); +const controllerHelpers = require('../controllers/helpers'); const privileges = require('../privileges'); const db = require('../database'); const utils = require('../utils'); const controllers404 = require('../controllers/404'); +const routeHelpers = require('./helpers'); const terms = { daily: 'day', @@ -23,18 +24,18 @@ const terms = { }; module.exports = function (app, middleware) { - app.get('/topic/:topic_id.rss', middleware.maintenanceMode, generateForTopic); - app.get('/category/:category_id.rss', middleware.maintenanceMode, generateForCategory); - app.get('/topics.rss', middleware.maintenanceMode, generateForTopics); - app.get('/recent.rss', middleware.maintenanceMode, generateForRecent); - app.get('/top.rss', middleware.maintenanceMode, generateForTop); - app.get('/top/:term.rss', middleware.maintenanceMode, generateForTop); - app.get('/popular.rss', middleware.maintenanceMode, generateForPopular); - app.get('/popular/:term.rss', middleware.maintenanceMode, generateForPopular); - app.get('/recentposts.rss', middleware.maintenanceMode, generateForRecentPosts); - app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, generateForCategoryRecentPosts); - app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, generateForUserTopics); - app.get('/tags/:tag.rss', middleware.maintenanceMode, generateForTag); + app.get('/topic/:topic_id.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTopic)); + app.get('/category/:category_id.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForCategory)); + app.get('/topics.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTopics)); + app.get('/recent.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForRecent)); + app.get('/top.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTop)); + app.get('/top/:term.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTop)); + app.get('/popular.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForPopular)); + app.get('/popular/:term.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForPopular)); + app.get('/recentposts.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForRecentPosts)); + app.get('/category/:category_id/recentposts.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForCategoryRecentPosts)); + app.get('/user/:userslug/topics.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForUserTopics)); + app.get('/tags/:tag.rss', middleware.maintenanceMode, routeHelpers.tryRoute(generateForTag)); }; async function validateTokenIfRequiresLogin(requiresLogin, cid, req, res) { @@ -46,16 +47,16 @@ async function validateTokenIfRequiresLogin(requiresLogin, cid, req, res) { } if (uid <= 0 || !token) { - return helpers.notAllowed(req, res); + return controllerHelpers.notAllowed(req, res); } const userToken = await db.getObjectField(`user:${uid}`, 'rss_token'); if (userToken !== token) { await user.auth.logAttempt(uid, req.ip); - return helpers.notAllowed(req, res); + return controllerHelpers.notAllowed(req, res); } const userPrivileges = await privileges.categories.get(cid, uid); if (!userPrivileges.read) { - return helpers.notAllowed(req, res); + return controllerHelpers.notAllowed(req, res); } return true; } @@ -127,7 +128,7 @@ async function generateForCategory(req, res, next) { db.getSortedSetRevIntersect({ sets: ['topics:tid', `cid:${cid}:tids:lastposttime`], start: 0, - stop: 25, + stop: 24, weights: [1, 0], }), ]); @@ -230,7 +231,7 @@ async function generateSorted(options, req, res, next) { const { cid } = req.query; if (cid) { if (!await privileges.categories.can('topics:read', cid, uid)) { - return helpers.notAllowed(req, res); + return controllerHelpers.notAllowed(req, res); } params.cids = [cid]; } diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js index db6e432fa6..4ff69e7fc0 100644 --- a/src/socket.io/posts/tools.js +++ b/src/socket.io/posts/tools.js @@ -14,15 +14,15 @@ const utils = require('../../utils'); module.exports = function (SocketPosts) { SocketPosts.loadPostTools = async function (socket, data) { - if (!data || !data.pid || !data.cid) { + if (!data || !data.pid) { throw new Error('[[error:invalid-data]]'); } - + const cid = await posts.getCidByPid(data.pid); const results = await utils.promiseParallel({ posts: posts.getPostFields(data.pid, ['deleted', 'bookmarks', 'uid', 'ip', 'flagId']), isAdmin: user.isAdministrator(socket.uid), isGlobalMod: user.isGlobalModerator(socket.uid), - isModerator: user.isModerator(socket.uid, data.cid), + isModerator: user.isModerator(socket.uid, cid), canEdit: privileges.posts.canEdit(data.pid, socket.uid), canDelete: privileges.posts.canDelete(data.pid, socket.uid), canPurge: privileges.posts.canPurge(data.pid, socket.uid), diff --git a/src/topics/create.js b/src/topics/create.js index fe0d710bed..d1fe0c6da9 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -82,9 +82,8 @@ module.exports = function (Topics) { data.title = String(data.title).trim(); data.tags = data.tags || []; - if (data.content) { - data.content = utils.rtrim(data.content); - } + data.content = String(data.content || '').trimEnd(); + Topics.checkTitle(data.title); await Topics.validateTags(data.tags, data.cid, uid); data.tags = await Topics.filterTags(data.tags, data.cid); @@ -167,9 +166,8 @@ module.exports = function (Topics) { data.cid = topicData.cid; await guestHandleValid(data); - if (data.content) { - data.content = utils.rtrim(data.content); - } + data.content = String(data.content || '').trimEnd(); + if (!data.fromQueue) { await user.isReadyToPost(uid, data.cid); Topics.checkContent(data.content); diff --git a/src/topics/tags.js b/src/topics/tags.js index 14ddb60a67..110a8585d8 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -287,7 +287,7 @@ module.exports = function (Topics) { } Topics.getTagData = function (tags) { - if (!tags.length) { + if (!tags || !tags.length) { return []; } tags.forEach((tag) => { diff --git a/src/user/admin.js b/src/user/admin.js index c92035fc47..b29adcf86f 100644 --- a/src/user/admin.js +++ b/src/user/admin.js @@ -70,7 +70,9 @@ module.exports = function (User) { let line = ''; usersData.forEach((user, index) => { - line += `${fields.map(field => user[field]).join(',')}`; + line += `${fields + .map(field => (isFinite(user[field]) ? `'${user[field]}'` : user[field])) + .join(',')}`; if (showIps) { userIPs = ips[index] ? ips[index].join(',') : ''; line += `,"${userIPs}"\n`; diff --git a/test/database/sorted.js b/test/database/sorted.js index 842b91b146..a5262a5394 100644 --- a/test/database/sorted.js +++ b/test/database/sorted.js @@ -996,6 +996,11 @@ describe('Sorted Set methods', () => { done(); }); }); + + it('should return empty array if sets is empty', async () => { + const result = await db.getSortedSetRevUnion({ sets: [], start: 0, stop: -1 }); + assert.deepStrictEqual(result, []); + }); }); describe('sortedSetIncrBy()', () => {