From 53a5f1516e6a4f9b77ca975f37405cd7ca5a0af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 4 Sep 2020 22:16:38 -0400 Subject: [PATCH] feat: move code --- src/emailer.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/emailer.js b/src/emailer.js index e65a647365..6ce57f1bce 100644 --- a/src/emailer.js +++ b/src/emailer.js @@ -170,9 +170,6 @@ Emailer.send = async function (template, uid, params) { return; } - // Combined passed-in payload with default values - params = { ...Emailer._defaultPayload, ...params }; - const [userData, userSettings] = await Promise.all([ User.getUserFields(uid, ['email', 'username', 'email:confirmed']), User.getSettings(uid), @@ -189,6 +186,8 @@ Emailer.send = async function (template, uid, params) { return; } + // Combined passed-in payload with default values + params = { ...Emailer._defaultPayload, ...params }; params.uid = uid; params.username = userData.username; params.rtl = await translator.translate('[[language:dir]]', userSettings.userLang) === 'rtl';