Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 00:21:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-10-24 19:25:39 -04:00
parent 48b09f1db6 d24bc5c52e
commit bcdcae7b9b
5 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
CHANGELOG.md
View File

@@ -1,3 +1,70 @@
#### v3.10.3 (2024-10-23)
##### Chores
* incrementing version number - v3.10.2 (2f15f464)
* update changelog for v3.10.2 (e780120a)
* incrementing version number - v3.10.1 (cca3a644)
* 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
* add missing await (0082ac98)
* closes #12858 (e6ab4b07)
* don't crash if profile folder doesn't exist (8a89c5d7)
#### v3.10.2 (2024-10-18)
##### Chores

2
install/package.json
View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "3.10.2",
"version": "3.10.3",
"homepage": "https://www.nodebb.org",
"repository": {
"type": "git",

4
src/controllers/helpers.js
View File

@@ -133,7 +133,7 @@ helpers.notAllowed = async function (req, res, error) {
if (req.loggedIn || req.uid === -1) {
if (res.locals.isAPI) {
if (req.originalUrl.startsWith(`${relative_path}/api/v3`)) {
helpers.formatApiResponse(403, res, error);
await helpers.formatApiResponse(403, res, error);
} else {
res.status(403).json({
path: req.path.replace(/^\/api/, ''),
@@ -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' : ''}`);

3
src/upgrades/3.8.0/user-upload-folders.js
View File

@@ -17,8 +17,9 @@ module.exports = {
const { progress } = this;
const folder = path.join(nconf.get('upload_path'), 'profile');
await mkdirp(folder);
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);

7
src/user/notifications.js
View File

@@ -206,15 +206,10 @@ UserNotifications.sendTopicNotificationToFollowers = async function (uid, topicD
if (!followers.length) {
return;
}
let { title } = topicData;
if (title) {
title = utils.decodeHTMLEntities(title);
title = title.replace(/,/g, '\\,');
}
const notifObj = await notifications.create({
type: 'new-topic',
bodyShort: translator.compile('notifications:user-posted-topic', postData.user.displayname, title),
bodyShort: translator.compile('notifications:user-posted-topic', postData.user.displayname, postData.topic.title),
bodyLong: postData.content,
pid: postData.pid,
path: `/post/${postData.pid}`,