From 7a513e6bdc0d7abc856afd190f3ee424d958574b Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 18 Oct 2024 13:15:57 +0000 Subject: [PATCH 1/5] chore: incrementing version number - v3.10.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 8daaa771ef..7d7e1827ab 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "3.10.1", + "version": "3.10.2", "homepage": "https://www.nodebb.org", "repository": { "type": "git", From e780120a62bee68d4508752d4b140d9715ebd7f9 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 18 Oct 2024 13:15:57 +0000 Subject: [PATCH 2/5] chore: update changelog for v3.10.2 --- CHANGELOG.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22f8f72af1..98115a192c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,77 @@ +#### v3.10.2 (2024-10-18) + +##### Chores + +* incrementing version number - v3.10.1 (cca3a644) +* update changelog for v3.10.1 (d63a8cca) +* incrementing version number - v3.10.0 (b60a9b4e) +* incrementing version number - v3.9.1 (f120c91c) +* incrementing version number - v3.9.0 (4880f32d) +* incrementing version number - v3.8.4 (4833f9a6) +* incrementing version number - v3.8.3 (97ce2c44) +* incrementing version number - v3.8.2 (72d91251) +* incrementing version number - v3.8.1 (527326f7) +* incrementing version number - v3.8.0 (e228a6eb) +* incrementing version number - v3.7.5 (6882894d) +* incrementing version number - v3.7.4 (6678744c) +* incrementing version number - v3.7.3 (2d62b6f6) +* incrementing version number - v3.7.2 (cc257e7e) +* incrementing version number - v3.7.1 (712365a5) +* incrementing version number - v3.7.0 (9a6153d7) +* incrementing version number - v3.6.7 (86a17e38) +* incrementing version number - v3.6.6 (6604bf37) +* incrementing version number - v3.6.5 (6c653625) +* incrementing version number - v3.6.4 (83d131b4) +* incrementing version number - v3.6.3 (fc7d2bfd) +* incrementing version number - v3.6.2 (0f577a57) +* incrementing version number - v3.6.1 (f1a69468) +* incrementing version number - v3.6.0 (4cdf85f8) +* incrementing version number - v3.5.3 (ed0e8783) +* incrementing version number - v3.5.2 (52fbb2da) +* incrementing version number - v3.5.1 (4c543488) +* incrementing version number - v3.5.0 (d06fb4f0) +* incrementing version number - v3.4.3 (5c984250) +* incrementing version number - v3.4.2 (3f0dac38) +* incrementing version number - v3.4.1 (01e69574) +* incrementing version number - v3.4.0 (fd9247c5) +* incrementing version number - v3.3.9 (5805e770) +* incrementing version number - v3.3.8 (a5603565) +* incrementing version number - v3.3.7 (b26f1744) +* incrementing version number - v3.3.6 (7fb38792) +* incrementing version number - v3.3.4 (a67f84ea) +* incrementing version number - v3.3.3 (f94d239b) +* incrementing version number - v3.3.2 (ec9dac97) +* incrementing version number - v3.3.1 (151cc68f) +* incrementing version number - v3.3.0 (fc1ad70f) +* incrementing version number - v3.2.3 (b06d3e63) +* incrementing version number - v3.2.2 (758ecfcd) +* incrementing version number - v3.2.1 (20145074) +* incrementing version number - v3.2.0 (9ecac38e) +* incrementing version number - v3.1.7 (0b4e81ab) +* incrementing version number - v3.1.6 (b3a3b130) +* incrementing version number - v3.1.5 (ec19343a) +* incrementing version number - v3.1.4 (2452783c) +* incrementing version number - v3.1.3 (3b4e9d3f) +* incrementing version number - v3.1.2 (40fa3489) +* incrementing version number - v3.1.1 (40250733) +* incrementing version number - v3.1.0 (0cb386bd) +* incrementing version number - v3.0.1 (26f6ea49) +* incrementing version number - v3.0.0 (224e08cd) + +##### Bug Fixes + +* closes #12848, add missing purge class (64779352) + +##### Performance Improvements + +* make unread faster if there are 60k+ unread topics (f53f1394) + +##### Refactors + +* single line (120b184e) +* hide modal and show alert on success (a309918e) +* more immediate feedback on category purge (72ccb870) + #### v3.10.1 (2024-10-09) ##### Chores From 8a89c5d759d338bfe23ed601d7f15b160b3cd040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 23 Oct 2024 11:25:32 -0400 Subject: [PATCH 3/5] fix: don't crash if profile folder doesn't exist --- src/upgrades/3.8.0/user-upload-folders.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/upgrades/3.8.0/user-upload-folders.js b/src/upgrades/3.8.0/user-upload-folders.js index 5be9990a06..33ac16e427 100644 --- a/src/upgrades/3.8.0/user-upload-folders.js +++ b/src/upgrades/3.8.0/user-upload-folders.js @@ -19,9 +19,15 @@ module.exports = { const folder = path.join(nconf.get('upload_path'), 'profile'); const userPicRegex = /^\d+-profile/; - const files = (await fs.promises.readdir(folder, { withFileTypes: true })) - .filter(item => !item.isDirectory() && String(item.name).match(userPicRegex)) - .map(item => item.name); + let files = []; + try { + files = (await fs.promises.readdir(folder, { withFileTypes: true })) + .filter(item => !item.isDirectory() && String(item.name).match(userPicRegex)) + .map(item => item.name); + } catch (err) { + console.error(err.stack); + return; + } progress.total = files.length; await batch.processArray(files, async (files) => { From e6ab4b07ddd3f6ddf2a850f0458f7e04bd9cd908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 23 Oct 2024 11:34:47 -0400 Subject: [PATCH 4/5] fix: closes #12858 --- src/upgrades/3.8.0/user-upload-folders.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/upgrades/3.8.0/user-upload-folders.js b/src/upgrades/3.8.0/user-upload-folders.js index 33ac16e427..fbacbc64c4 100644 --- a/src/upgrades/3.8.0/user-upload-folders.js +++ b/src/upgrades/3.8.0/user-upload-folders.js @@ -17,17 +17,12 @@ module.exports = { const { progress } = this; const folder = path.join(nconf.get('upload_path'), 'profile'); - + await mkdirp(folder); const userPicRegex = /^\d+-profile/; - let files = []; - try { - files = (await fs.promises.readdir(folder, { withFileTypes: true })) - .filter(item => !item.isDirectory() && String(item.name).match(userPicRegex)) - .map(item => item.name); - } catch (err) { - console.error(err.stack); - return; - } + + const files = (await fs.promises.readdir(folder, { withFileTypes: true })) + .filter(item => !item.isDirectory() && String(item.name).match(userPicRegex)) + .map(item => item.name); progress.total = files.length; await batch.processArray(files, async (files) => { From 0082ac981dd1a91bb704010d0b293da75a41bde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 23 Oct 2024 16:32:11 -0400 Subject: [PATCH 5/5] fix: add missing await --- src/controllers/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js index c17e701b79..3d40445611 100644 --- a/src/controllers/helpers.js +++ b/src/controllers/helpers.js @@ -155,7 +155,7 @@ helpers.notAllowed = async function (req, res, error) { } } else if (res.locals.isAPI) { req.session.returnTo = req.url.replace(/^\/api/, ''); - helpers.formatApiResponse(401, res, error); + await helpers.formatApiResponse(401, res, error); } else { req.session.returnTo = req.url; res.redirect(`${relative_path}/login${req.path.startsWith('/admin') ? '?local=1' : ''}`);