krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Removed user's party invites when last user leaves party""

Browse Source
This commit is contained in:
Kevin Gisi
2015-09-17 23:27:21 -04:00
parent e15cc9ec82
commit 4525ee5358
2 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/src/models/group.js
View File

@@ -89,15 +89,22 @@ GroupSchema.pre('remove', function(next) {
var group = this;
async.waterfall([
function(cb) {
User.find({
'invitations.guilds.id': group._id
}, cb);
var invitationQuery = {};
var groupType = group.type;
//Add an 's' to group type guild because the model has the plural version
if (group.type == "guild") groupType += "s";
invitationQuery['invitations.' + groupType + '.id'] = group._id;
User.find(invitationQuery, cb);
},
function(users, cb) {
if (users) {
users.forEach(function (user, index, array) {
var i = _.findIndex(user.invitations.guilds, {id: group._id});
user.invitations.guilds.splice(i, 1);
if ( group.type == "party" ) {
user.invitations.party = {};
} else {
var i = _.findIndex(user.invitations.guilds, {id: group._id});
user.invitations.guilds.splice(i, 1);
}
user.save();
});
}