sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-12 06:57:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: Simplify flag_report_email load

Browse source
This commit is contained in:
Blade Barringer 2016-04-08 17:14:14 -05:00
parent b7d801a603
commit 2bbae8c5f5
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.json.example
View file

@ -29,7 +29,7 @@
"MWS_KEY": "",
"MWS_SECRET": ""
},
"FLAG_REPORT_EMAIL": ["email@mod.com"],
"FLAG_REPORT_EMAIL": "email@mod.com,email2@mod.com",
"EMAIL_SERVER": {
"url": "http://example.com",
"authUser": "user",

14
website/src/controllers/api-v2/groups.js
View file

@ -31,6 +31,8 @@ var partyFields = api.partyFields = 'profile preferences stats achievements part
var nameFields = 'profile.name';
var challengeFields = '_id name';
var guildPopulate = {path: 'members', select: nameFields, options: {limit: 15} };
const FLAG_REPORT_EMAILS = nconf.get('FLAG_REPORT_EMAIL').split(',').map(email => {return {email, canSend: true}});
/**
* For parties, we want a lot of member details so we can show their avatars in the header. For guilds, we want very
* limited fields - and only a sampling of the members, beacuse they can be in the thousands
@ -366,18 +368,8 @@ api.flagChatMessage = function(req, res, next){
'chat.$.flagCount': message.flagCount,
}}, function(err) {
if (err) return next(err);
var addressesToSendTo = nconf.get('FLAG_REPORT_EMAIL');
addressesToSendTo = (typeof addressesToSendTo == 'string') ? JSON.parse(addressesToSendTo) : addressesToSendTo;
if(Array.isArray(addressesToSendTo)){
addressesToSendTo = addressesToSendTo.map(function(email){
return {email: email, canSend: true}
});
}else{
addressesToSendTo = {email: addressesToSendTo}
}
utils.txnEmail(addressesToSendTo, 'flag-report-to-mods', [
utils.txnEmail(FLAG_REPORT_EMAILS, 'flag-report-to-mods', [
{name: "MESSAGE_TIME", content: (new Date(message.timestamp)).toString()},
{name: "MESSAGE_TEXT", content: message.text},