From 63572c23ce366feac56a380126af631bebba048c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 25 Oct 2021 15:00:05 -0400 Subject: [PATCH] fix: profile edit fields showing translated values --- src/controllers/accounts/helpers.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index c3a4cb6d35..21e3e16908 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -95,13 +95,13 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) userData.sso = results.sso.associations; userData.banned = Boolean(userData.banned); - userData.website = validator.escape(String(userData.website || '')); + userData.website = escape(userData.website); userData.websiteLink = !userData.website.startsWith('http') ? `http://${userData.website}` : userData.website; userData.websiteName = userData.website.replace(validator.escape('http://'), '').replace(validator.escape('https://'), ''); - userData.fullname = validator.escape(String(userData.fullname || '')); - userData.location = validator.escape(String(userData.location || '')); - userData.signature = validator.escape(String(userData.signature || '')); + userData.fullname = escape(userData.fullname); + userData.location = escape(userData.location); + userData.signature = escape(userData.signature); userData.birthday = validator.escape(String(userData.birthday || '')); userData.moderationNote = validator.escape(String(userData.moderationNote || '')); @@ -125,6 +125,10 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) return hookData.userData; }; +function escape(value) { + return translator.escape(validator.escape(String(value || ''))); +} + async function getAllData(uid, callerUID) { return await utils.promiseParallel({ userData: user.getUserData(uid), @@ -234,6 +238,7 @@ async function parseAboutMe(userData) { } userData.aboutme = validator.escape(String(userData.aboutme || '')); const parsed = await plugins.hooks.fire('filter:parse.aboutme', userData.aboutme); + userData.aboutme = translator.escape(userData.aboutme); userData.aboutmeParsed = translator.escape(parsed); }