From 2c0b63227e72efe5b753b4d10e2bf1fdb718363b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:12:27 -0500 Subject: [PATCH 1/5] fix(deps): update dependency nodebb-plugin-emoji to v3.5.12 (#10279) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 267e705535..82c7da2065 100644 --- a/install/package.json +++ b/install/package.json @@ -88,7 +88,7 @@ "nodebb-plugin-2factor": "3.0.4", "nodebb-plugin-composer-default": "7.0.20", "nodebb-plugin-dbsearch": "5.1.1", - "nodebb-plugin-emoji": "3.5.11", + "nodebb-plugin-emoji": "3.5.12", "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "9.0.5", "nodebb-plugin-mentions": "3.0.4", From 3dc108d316b1a0ff510381a4eb92f6b162d5b9e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 12:12:33 -0500 Subject: [PATCH 2/5] fix(deps): update dependency nodebb-plugin-spam-be-gone to v0.7.13 (#10280) Co-authored-by: Renovate Bot --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 82c7da2065..d463b50a8d 100644 --- a/install/package.json +++ b/install/package.json @@ -92,7 +92,7 @@ "nodebb-plugin-emoji-android": "2.0.5", "nodebb-plugin-markdown": "9.0.5", "nodebb-plugin-mentions": "3.0.4", - "nodebb-plugin-spam-be-gone": "0.7.12", + "nodebb-plugin-spam-be-gone": "0.7.13", "nodebb-rewards-essentials": "0.2.1", "nodebb-theme-lavender": "5.3.2", "nodebb-theme-persona": "11.3.38", From 6aae2e5d899603eeaece894c984860961e9c3712 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 11 Feb 2022 14:12:22 -0500 Subject: [PATCH 3/5] Revert "fix: proactively guard against homograph characters in website values" This reverts commit fa7dcdb9686e2af14b83c3a8775828bd53b2c22d. --- src/user/profile.js | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/src/user/profile.js b/src/user/profile.js index 6f77806d4f..3c93cb8bd0 100644 --- a/src/user/profile.js +++ b/src/user/profile.js @@ -4,7 +4,6 @@ const _ = require('lodash'); const validator = require('validator'); const winston = require('winston'); -const punycode = require('punycode'); const utils = require('../utils'); const slugify = require('../slugify'); @@ -46,28 +45,14 @@ module.exports = function (User) { data[field] = data[field].trim(); - switch (field) { - case 'email': { - return await updateEmail(updateUid, data.email); - } - - case 'username': { - return await updateUsername(updateUid, data.username); - } - - case 'fullname': { - return await updateFullname(updateUid, data.fullname); - } - - case 'website': { - updateData[field] = punycode.toASCII(data[field]); - break; - } - - default: { - updateData[field] = data[field]; - } + if (field === 'email') { + return await updateEmail(updateUid, data.email); + } else if (field === 'username') { + return await updateUsername(updateUid, data.username); + } else if (field === 'fullname') { + return await updateFullname(updateUid, data.fullname); } + updateData[field] = data[field]; })); if (Object.keys(updateData).length) { From e9cb1452f97a595a7fd872c9c97bfe919d0bc267 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 11 Feb 2022 14:12:52 -0500 Subject: [PATCH 4/5] chore: remove punycode dep --- install/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index d463b50a8d..be5905c816 100644 --- a/install/package.json +++ b/install/package.json @@ -109,7 +109,6 @@ "postcss": "8.4.6", "postcss-clean": "1.2.0", "prompt": "1.2.1", - "punycode": "2.1.1", "ioredis": "4.28.5", "request": "2.88.2", "request-promise-native": "1.0.9", @@ -185,4 +184,4 @@ "url": "https://github.com/barisusakli" } ] -} \ No newline at end of file +} From 3225a1affc3b977fc059c3e9acc3d3fd4854c5f9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 11 Feb 2022 19:13:56 +0000 Subject: [PATCH 5/5] fix(deps): update dependency nodebb-plugin-markdown to v9.0.6 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index be5905c816..f4fe74032d 100644 --- a/install/package.json +++ b/install/package.json @@ -90,7 +90,7 @@ "nodebb-plugin-dbsearch": "5.1.1", "nodebb-plugin-emoji": "3.5.12", "nodebb-plugin-emoji-android": "2.0.5", - "nodebb-plugin-markdown": "9.0.5", + "nodebb-plugin-markdown": "9.0.6", "nodebb-plugin-mentions": "3.0.4", "nodebb-plugin-spam-be-gone": "0.7.13", "nodebb-rewards-essentials": "0.2.1",