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

feat: no more sending emails to banned users, + feature flag

Browse Source
This commit is contained in:
Julian Lam
2022-01-28 15:02:21 -05:00
parent f0e32ff182
commit ea27eaf166
5 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/emailer.js
View File

@@ -218,7 +218,8 @@ Emailer.send = async (template, uid, params) => {
throw Error('[emailer] App not ready!');
}
let userData = await User.getUserFields(uid, ['email', 'username', 'email:confirmed']);
let userData = await User.getUserFields(uid, ['email', 'username', 'email:confirmed', 'banned']);
userData.banned = true;
// 'welcome' and 'verify-email' explicitly used passed-in email address
if (['welcome', 'verify-email'].includes(template)) {
@@ -226,6 +227,14 @@ Emailer.send = async (template, uid, params) => {
}
({ template, userData, params } = await Plugins.hooks.fire('filter:email.prepare', { template, uid, userData, params }));
if (!meta.config.sendEmailToBanned && template !== 'banned') {
if (userData.banned) {
winston.warn(`[emailer/send] User ${userData.username} (uid: ${uid}) is banned; not sending email due to system config.`);
return false;
}
}
if (!userData || !userData.email) {
if (process.env.NODE_ENV === 'development') {
winston.warn(`uid : ${uid} has no email, not sending "${template}" email.`);

7
src/views/admin/settings/email.tpl
View File

@@ -51,6 +51,13 @@
</div>
<p class="help-block">[[admin/settings/email:prompt-help]]</p>
<div class="checkbox">
<label for="sendEmailToBanned" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" id="sendEmailToBanned" data-field="sendEmailToBanned" name="sendEmailToBanned" />
<span class="mdl-switch__label">[[admin/settings/email:sendEmailToBanned]]</span>
</label>
</div>
<div class="checkbox">
<label for="removeEmailNotificationImages" class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" id="removeEmailNotificationImages" data-field="removeEmailNotificationImages" name="removeEmailNotificationImages" />