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

merge into develop

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-09-06 21:21:39 +02:00
parent 4600e96dc0 7bfa18fd05
commit bfd6d055b0
123 changed files with 4005 additions and 2132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,13 +361,6 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
var groupWasRemoved = false;
async.parallel([
// Remove active quest from user if they're leaving the party
function(cb){
if (group.type != 'party') return cb(null, {} ,1);
user.party.quest = Group.cleanQuestProgress();
user.save(cb);
},
// Remove user from group challenges
function(cb){
async.waterfall([
@@ -419,27 +412,18 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
}else{ // otherwise just remove a member
var update = {$pull: {members: user._id}};
if (group.type == 'party' && group.quest.key){
update['$unset'] = {};
update['$unset']['quest.members.' + user._id] = 1;
}
var seniorMember = _.find(group.members, function (m) {return m != user._id});
// If the leader is leaving (or if the leader previously left, and this wasn't accounted for)
var leader = group.leader;
// could not exist in case of public guild with 1 member who is leaving
if(seniorMember){
if (leader == user._id || !~group.members.indexOf(leader)) {
update['$set'] = update['$set'] || {};
update['$set'].leader = seniorMember;
}
if(leader == user._id || !~group.members.indexOf(leader)){
var seniorMember = _.find(group.members, function (m) {return m != user._id});
leader = group.quest && group.quest.leader;
if (leader && (leader == user._id || !~group.members.indexOf(leader))) {
update['$set'] = update['$set'] || {};
update['$set']['quest.leader'] = seniorMember;
// could not exist in case of public guild with 1 member who is leaving
if(seniorMember){
if (leader == user._id || !~group.members.indexOf(leader)) {
update['$set'] = update['$set'] || {};
update['$set'].leader = seniorMember;
}
}
}