krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3-session-invite

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-02-27 12:04:39 +01:00
parent b4e4e31be5 cc5f794f3d
commit b4f7625d93
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/server_side/controllers/groups.test.js
View File

@@ -111,8 +111,7 @@ describe('Groups Controller', function() {
'invite-friend', 'invite-friend',
[ [
{ name: 'LINK', content: '?partyInvite=http://link.com' }, { name: 'LINK', content: '?partyInvite=http://link.com' },
{ name: 'INVITER', content: 'inviter' }, { name: 'INVITER', content: 'inviter' }
{ name: 'REPLY_TO_ADDRESS', content: 'inviter@example.com' }
] ]
); );
}); });

7
website/src/controllers/api-v2/groups.js
View File

@@ -587,8 +587,7 @@ var inviteByUUIDs = function(uuids, group, req, res, next){
if(invite.preferences.emailNotifications['invited' + (group.type == 'guild' ? 'Guild' : 'Party')] !== false){ if(invite.preferences.emailNotifications['invited' + (group.type == 'guild' ? 'Guild' : 'Party')] !== false){
var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']);
var emailVars = [ var emailVars = [
{name: 'INVITER', content: inviterVars.name}, {name: 'INVITER', content: inviterVars.name}
{name: 'REPLY_TO_ADDRESS', content: inviterVars.email}
]; ];
if(group.type == 'guild'){ if(group.type == 'guild'){
@@ -653,8 +652,7 @@ var inviteByEmails = function(invites, group, req, res, next){
var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']);
var variables = [ var variables = [
{name: 'LINK', content: link}, {name: 'LINK', content: link},
{name: 'INVITER', content: req.body.inviter || inviterVars.name}, {name: 'INVITER', content: req.body.inviter || inviterVars.name}
{name: 'REPLY_TO_ADDRESS', content: inviterVars.email}
]; ];
if(group.type == 'guild'){ if(group.type == 'guild'){
@@ -954,7 +952,6 @@ api.questAccept = function(req, res, next) {
utils.txnEmail(membersToEmail, ('invite-' + (quest.boss ? 'boss' : 'collection') + '-quest'), [ utils.txnEmail(membersToEmail, ('invite-' + (quest.boss ? 'boss' : 'collection') + '-quest'), [
{name: 'QUEST_NAME', content: quest.text()}, {name: 'QUEST_NAME', content: quest.text()},
{name: 'INVITER', content: inviterVars.name}, {name: 'INVITER', content: inviterVars.name},
{name: 'REPLY_TO_ADDRESS', content: inviterVars.email},
{name: 'PARTY_URL', content: '/#/options/groups/party'} {name: 'PARTY_URL', content: '/#/options/groups/party'}
]); ]);