sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-19 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5336 from negue/fixQuestNotify

Browse source 
FIX: Quest Invitation Notification
This commit is contained in:
negue 2015-06-03 07:52:09 +02:00
commit d6f5ba0fc7
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
website/src/controllers/groups.js
View file

@ -831,13 +831,18 @@ questStart = function(req, res, next) {
updates['$set']['party.quest.progress.collect'] = collected;
updates['$set']['party.quest.completed'] = null;
questMembers[m] = true;
User.findOne({_id: m}, {pushDevices: 1}, function(err, user){
pushNotify.sendNotify(user, "HabitRPG", shared.i18n.t('questStarted') + ": "+ quest.text() );
});
} else {
updates['$set']['party.quest'] = Group.cleanQuestProgress();
}
parallel.push(function(cb2){
User.update({_id:m},updates,cb2);
});
})
});
group.quest.active = true;
if (quest.boss) {
@ -913,10 +918,6 @@ api.questAccept = function(req, res, next) {
group.quest.leader = user._id;
} else {
group.quest.members[m] = undefined;
User.findById(m, function(err,groupMember){
pushNotify.sendNotify(groupMember, shared.i18n.t('questInvitationTitle'), shared.i18n.t('questInvitationInfo', { quest: quest.text() }));
});
}
});
@ -924,7 +925,7 @@ api.questAccept = function(req, res, next) {
_id: {
$in: _.without(group.members, user._id)
}
}, {auth: 1, preferences: 1, profile: 1}, function(err, members){
}, {auth: 1, preferences: 1, profile: 1, pushDevices: 1}, function(err, members){
if(err) return next(err);
var inviterVars = utils.getUserInfo(user, ['name', 'email']);
@ -940,6 +941,10 @@ api.questAccept = function(req, res, next) {
{name: 'PARTY_URL', content: '/#/options/groups/party'}
]);
_.each(members, function(groupMember){
pushNotify.sendNotify(groupMember, shared.i18n.t('questInvitationTitle'), shared.i18n.t('questInvitationInfo', { quest: quest.text() }));
});
questStart(req,res,next);
});