Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: move code

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-09-04 22:16:38 -04:00
parent b6917b9dee
commit 53a5f1516e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/emailer.js
View File

@@ -170,9 +170,6 @@ Emailer.send = async function (template, uid, params) {
return; return;
} }
// Combined passed-in payload with default values
params = { ...Emailer._defaultPayload, ...params };
const [userData, userSettings] = await Promise.all([ const [userData, userSettings] = await Promise.all([
User.getUserFields(uid, ['email', 'username', 'email:confirmed']), User.getUserFields(uid, ['email', 'username', 'email:confirmed']),
User.getSettings(uid), User.getSettings(uid),
@@ -189,6 +186,8 @@ Emailer.send = async function (template, uid, params) {
return; return;
} }
// Combined passed-in payload with default values
params = { ...Emailer._defaultPayload, ...params };
params.uid = uid; params.uid = uid;
params.username = userData.username; params.username = userData.username;
params.rtl = await translator.translate('[[language:dir]]', userSettings.userLang) === 'rtl'; params.rtl = await translator.translate('[[language:dir]]', userSettings.userLang) === 'rtl';