From 024a546780fb048069fe8ee3da933e5ed5753b5b Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 5 Jul 2023 19:36:29 +0000 Subject: [PATCH 01/11] chore: incrementing version number - v3.2.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 6701232457..56825c6d14 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "3.2.0", + "version": "3.2.1", "homepage": "https://www.nodebb.org", "repository": { "type": "git", From c7f8cee9f786a483d00e247fa1033a33364026c8 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 5 Jul 2023 19:36:29 +0000 Subject: [PATCH 02/11] chore: update changelog for v3.2.1 --- CHANGELOG.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91e3df8def..92d04ca3d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,32 @@ +#### v3.2.1 (2023-07-05) + +##### Chores + +* up harmony (9fc5ae08) +* up composer (82d37702) +* up spider-detector (97d8f858) +* incrementing version number - v3.2.0 (9ecac38e) +* update changelog for v3.2.0 (080f9e75) +* 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 + +* #11766, allow privileged users to vote and chat (1bda9073) +* #11775, trim -rtl from targetSkin (0183e5f8) +* #11773, fix create token button (64d30182) +* add ?page= to canonical urls (4045681a) +* group membership methods for guests/spiders (7d5fe20b) +* **deps:** update dependency nodebb-plugin-emoji to v5.1.3 (#11777) (a1110f10) + #### v3.2.0 (2023-06-28) ##### Chores From bf114c11061001c87e26e8c339de848038eedfa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 10 Jul 2023 09:05:37 -0400 Subject: [PATCH 03/11] fix: #11786 fix selector for upgradable plugins --- public/src/admin/extend/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 622908e9fe..d24830f5b4 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -342,7 +342,7 @@ define('admin/extend/plugins', [ function populateUpgradeablePlugins() { $('#installed ul li').each(function () { - if ($(this).children('[data-action="upgrade"]').length) { + if ($(this).find('[data-action="upgrade"]').length) { $('#upgrade ul').append($(this).clone(true)); } }); From 796730dc54c36237bdad25dba4019390c1d3a69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 10 Jul 2023 16:13:26 -0400 Subject: [PATCH 04/11] test no escape on canonical --- src/controllers/topics.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index 58ca059502..ad63672e56 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -261,6 +261,7 @@ async function addTags(topicData, req, res, currentPage) { { rel: 'canonical', href: `${url}/topic/${topicData.slug}${page}`, + noEscape: true, }, ]; From 21b510bf24cdea521679cf7fad01428af26fcc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 10 Jul 2023 16:23:22 -0400 Subject: [PATCH 05/11] spec --- public/openapi/components/schemas/CommonProps.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/openapi/components/schemas/CommonProps.yaml b/public/openapi/components/schemas/CommonProps.yaml index bf8572b286..f485265da9 100644 --- a/public/openapi/components/schemas/CommonProps.yaml +++ b/public/openapi/components/schemas/CommonProps.yaml @@ -68,6 +68,8 @@ CommonProps: type: string as: type: string + noEscape: + type: boolean crossorigin: type: string enum: ['', 'anonymous', 'use-credentials'] From 6ae0df4f469b54f7de9f810865c92594d26f6b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 10 Jul 2023 18:07:04 -0400 Subject: [PATCH 06/11] fix: #11787 --- public/scss/admin/modules/nprogress.scss | 51 +++++++++--------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/public/scss/admin/modules/nprogress.scss b/public/scss/admin/modules/nprogress.scss index 4584a127d7..99807bf906 100644 --- a/public/scss/admin/modules/nprogress.scss +++ b/public/scss/admin/modules/nprogress.scss @@ -1,8 +1,8 @@ #nprogress { pointer-events: none; - } +} - #nprogress .bar { +#nprogress .bar { background: #29d; position: fixed; @@ -12,9 +12,9 @@ width: 100%; height: 2px; - } +} - #nprogress .peg { +#nprogress .peg { display: block; position: absolute; right: 0px; @@ -26,26 +26,13 @@ -webkit-transform: rotate(3deg) translate(0px, -4px); -ms-transform: rotate(3deg) translate(0px, -4px); transform: rotate(3deg) translate(0px, -4px); - } - - #nprogress .spinner { - display: block; - position: fixed; - z-index: 1031; - top: 165px; - right: 35px; - } - - @include media-breakpoint-down(sm) { - #nprogress .spinner { - bottom: 15px; - right: 15px; - top: initial; - } - } +} +#nprogress .spinner { + display: none; +} - #nprogress .spinner-icon { +#nprogress .spinner-icon { width: 18px; height: 18px; box-sizing: border-box; @@ -57,24 +44,24 @@ -webkit-animation: nprogress-spinner 400ms linear infinite; animation: nprogress-spinner 400ms linear infinite; - } +} - .nprogress-custom-parent { +.nprogress-custom-parent { overflow: hidden; position: relative; - } +} - .nprogress-custom-parent #nprogress .spinner, - .nprogress-custom-parent #nprogress .bar { +.nprogress-custom-parent #nprogress .spinner, +.nprogress-custom-parent #nprogress .bar { position: absolute; - } +} - @-webkit-keyframes nprogress-spinner { +@-webkit-keyframes nprogress-spinner { 0% { -webkit-transform: rotate(0deg); } 100% { -webkit-transform: rotate(360deg); } - } - @keyframes nprogress-spinner { +} +@keyframes nprogress-spinner { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } - } +} From 509faa5eccf2cbe33caded73a3892fc9aefc5c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 11 Jul 2023 11:04:51 -0400 Subject: [PATCH 07/11] chore: remove log --- public/src/client/post-queue.js | 1 - 1 file changed, 1 deletion(-) diff --git a/public/src/client/post-queue.js b/public/src/client/post-queue.js index a4b357b1d2..d7cfb9f230 100644 --- a/public/src/client/post-queue.js +++ b/public/src/client/post-queue.js @@ -110,7 +110,6 @@ define('forum/post-queue', [ if (listEl) { listEl.addEventListener('click', (e) => { const subselector = e.target.closest('[data-action]'); - console.log(subselector); if (subselector) { const action = subselector.getAttribute('data-action'); const uid = subselector.closest('[data-uid]').getAttribute('data-uid'); From eed34d04f9c2f3cdcc3c3b9e876df815742ff68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 11 Jul 2023 12:33:02 -0400 Subject: [PATCH 08/11] chore: up spam-be-gone --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 56825c6d14..d04adb8f13 100644 --- a/install/package.json +++ b/install/package.json @@ -99,7 +99,7 @@ "nodebb-plugin-markdown": "12.1.4", "nodebb-plugin-mentions": "4.2.0", "nodebb-plugin-ntfy": "1.0.15", - "nodebb-plugin-spam-be-gone": "2.1.0", + "nodebb-plugin-spam-be-gone": "2.1.1", "nodebb-rewards-essentials": "0.2.3", "nodebb-theme-harmony": "1.0.65", "nodebb-theme-lavender": "7.1.1", From f1170b189643af537920e2f821156d30a8d83e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 11 Jul 2023 19:51:47 -0400 Subject: [PATCH 09/11] chore: up themes --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index d04adb8f13..57608df1e4 100644 --- a/install/package.json +++ b/install/package.json @@ -101,10 +101,10 @@ "nodebb-plugin-ntfy": "1.0.15", "nodebb-plugin-spam-be-gone": "2.1.1", "nodebb-rewards-essentials": "0.2.3", - "nodebb-theme-harmony": "1.0.65", + "nodebb-theme-harmony": "1.0.66", "nodebb-theme-lavender": "7.1.1", "nodebb-theme-peace": "2.0.32", - "nodebb-theme-persona": "13.1.6", + "nodebb-theme-persona": "13.1.8", "nodebb-widget-essentials": "7.0.13", "nodemailer": "6.9.3", "nprogress": "0.2.0", From e8b40b58841dd99291eb7d764b5b536c7deff5e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 12 Jul 2023 10:20:20 -0400 Subject: [PATCH 10/11] fix persona defaults fix missing theme:id --- public/src/admin/appearance/themes.js | 8 ++++---- src/middleware/helpers.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/src/admin/appearance/themes.js b/public/src/admin/appearance/themes.js index 36a98c6a38..f2a023206f 100644 --- a/public/src/admin/appearance/themes.js +++ b/public/src/admin/appearance/themes.js @@ -46,20 +46,20 @@ define('admin/appearance/themes', ['bootbox', 'translator', 'alerts'], function }); $('#revert_theme').on('click', function () { - if (config['theme:id'] === 'nodebb-theme-persona') { + if (config['theme:id'] === 'nodebb-theme-harmony') { return; } bootbox.confirm('[[admin/appearance/themes:revert-confirm]]', function (confirm) { if (confirm) { socket.emit('admin.themes.set', { type: 'local', - id: 'nodebb-theme-persona', + id: 'nodebb-theme-harmony', }, function (err) { if (err) { return alerts.error(err); } - config['theme:id'] = 'nodebb-theme-persona'; - highlightSelectedTheme('nodebb-theme-persona'); + config['theme:id'] = 'nodebb-theme-harmony'; + highlightSelectedTheme('nodebb-theme-harmony'); alerts.alert({ alert_id: 'admin:theme', type: 'success', diff --git a/src/middleware/helpers.js b/src/middleware/helpers.js index a0ebb06d20..dde0c3b749 100644 --- a/src/middleware/helpers.js +++ b/src/middleware/helpers.js @@ -65,7 +65,7 @@ helpers.buildBodyClass = function (req, res, templateData = {}) { parts.push(`page-status-${res.statusCode}`); - parts.push(`theme-${meta.config['theme:id'].split('-')[2]}`); + parts.push(`theme-${(meta.config['theme:id'] || '').split('-')[2]}`); if (req.loggedIn) { parts.push('user-loggedin'); From f2152953cddd3247746ef393516b0a53ba7750a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 12 Jul 2023 10:40:25 -0400 Subject: [PATCH 11/11] add displayname to parent posts --- public/src/modules/helpers.common.js | 6 +++--- src/topics/posts.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js index d607d7e20f..123b5eccc6 100644 --- a/public/src/modules/helpers.common.js +++ b/public/src/modules/helpers.common.js @@ -327,11 +327,11 @@ module.exports = function (utils, Benchpress, relative_path) { } function generateRepliedTo(post, timeagoCutoff) { - const username = post.parent && post.parent.username ? - post.parent.username : '[[global:guest]]'; + const displayname = post.parent && post.parent.displayname ? + post.parent.displayname : '[[global:guest]]'; const isBeforeCutoff = post.timestamp < (Date.now() - (timeagoCutoff * oneDayInMs)); const langSuffix = isBeforeCutoff ? 'on' : 'ago'; - return `[[topic:replied-to-user-${langSuffix}, ${post.toPid}, ${relative_path}/post/${post.toPid}, ${username}, ${relative_path}/post/${post.pid}, ${post.timestampISO}]]`; + return `[[topic:replied-to-user-${langSuffix}, ${post.toPid}, ${relative_path}/post/${post.toPid}, ${displayname}, ${relative_path}/post/${post.pid}, ${post.timestampISO}]]`; } function generateWrote(post, timeagoCutoff) { diff --git a/src/topics/posts.js b/src/topics/posts.js index 58ad3d20c9..438844d753 100644 --- a/src/topics/posts.js +++ b/src/topics/posts.js @@ -186,13 +186,13 @@ module.exports = function (Topics) { const parentUids = _.uniq(parentPosts.map(postObj => postObj && postObj.uid)); const userData = await user.getUsersFields(parentUids, ['username']); - const usersMap = {}; - userData.forEach((user) => { - usersMap[user.uid] = user.username; - }); + const usersMap = _.zipObject(parentUids, userData); const parents = {}; parentPosts.forEach((post, i) => { - parents[parentPids[i]] = { username: usersMap[post.uid] }; + parents[parentPids[i]] = { + username: usersMap[post.uid].username, + displayname: usersMap[post.uid].displayname, + }; }); postData.forEach((post) => {