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

remove unnecessary code

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-09-04 16:36:03 +02:00
parent d5fb2afaa4
commit ee9b3d7857
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -374,7 +374,7 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
group: group._id // that belong to the group I am leaving group: group._id // that belong to the group I am leaving
}, cb2); }, cb2);
}, },
// Update each challenge // Update each challenge
function(challenges, cb2) { function(challenges, cb2) {
Challenge.update( Challenge.update(
@@ -412,28 +412,27 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
_id: group._id _id: group._id
}, cb); }, cb);
}else{ // otherwise just remove a member }else{ // otherwise just remove a member
var update = {$pull:{members:user._id}}; var update = {$pull: {members: user._id}};
if (group.type == 'party' && group.quest.key){ if (group.type == 'party' && group.quest.key){
update['$unset'] = {}; update['$unset'] = {};
update['$unset']['quest.members.' + user._id] = 1; update['$unset']['quest.members.' + user._id] = 1;
} }
// FIXME do we want to remove the group `if group.members.length == 0` ? (well, 1 since the update hasn't gone through yet)
if (group.members.length > 1) { var seniorMember = _.find(group.members, function (m) {return m != user._id});
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)
// If the leader is leaving (or if the leader previously left, and this wasn't accounted for) var leader = group.leader;
var leader = group.leader; if (leader == user._id || !~group.members.indexOf(leader)) {
if (leader == user._id || !~group.members.indexOf(leader)) { update['$set'] = update['$set'] || {};
update['$set'] = update['$set'] || {}; update['$set'].leader = seniorMember;
update['$set'].leader = seniorMember;
}
leader = group.quest && group.quest.leader;
if (leader && (leader == user._id || !~group.members.indexOf(leader))) {
update['$set'] = update['$set'] || {};
update['$set']['quest.leader'] = seniorMember;
}
} }
leader = group.quest && group.quest.leader;
if (leader && (leader == user._id || !~group.members.indexOf(leader))) {
update['$set'] = update['$set'] || {};
update['$set']['quest.leader'] = seniorMember;
}
update['$inc'] = {memberCount: -1}; update['$inc'] = {memberCount: -1};
Group.update({_id:group._id},update,cb); Group.update({_id:group._id}, update, cb);
} }
} }
], mainCb); ], mainCb);