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

Removed firebase deleteGroup to post remove

Browse Source
This commit is contained in:
TheHollidayInn
2015-09-08 21:17:28 -05:00
parent cf2548693f
commit ca37f4161c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,10 @@ GroupSchema.pre('remove', function(next) {
], next); ], next);
}); });
GroupSchema.post('remove', function(group) {
firebase.deleteGroup(group._id);
});
GroupSchema.methods.toJSON = function(){ GroupSchema.methods.toJSON = function(){
var doc = this.toObject(); var doc = this.toObject();
removeDuplicates(doc); removeDuplicates(doc);
@@ -379,7 +383,6 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
if(typeof keep !== 'string') keep = 'keep-all'; // can be also 'remove-all' if(typeof keep !== 'string') keep = 'keep-all'; // can be also 'remove-all'
var group = this; var group = this;
var groupWasRemoved = false;
async.parallel([ async.parallel([
// Remove user from group challenges // Remove user from group challenges
@@ -425,7 +428,6 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
group.type === 'party' || group.type === 'party' ||
(group.type === 'guild' && group.privacy === 'private') (group.type === 'guild' && group.privacy === 'private')
)){ )){
groupWasRemoved = true;
group.remove(cb) group.remove(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}};
@@ -453,7 +455,6 @@ GroupSchema.methods.leave = function(user, keep, mainCb){
if(err) return mainCb(err); if(err) return mainCb(err);
firebase.removeUserFromGroup(group._id, user._id); firebase.removeUserFromGroup(group._id, user._id);
if(groupWasRemoved) firebase.deleteGroup(group._id);
return mainCb(); return mainCb();
}); });
}; };