diff --git a/package.json b/package.json index 15d13a6fe3..8e57639e57 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "resolve": "~0.2.3", "expect.js": "~0.2.0", "relative-date": "~1.1.1", - "lodash": "~1.3.1", + "lodash": "~2.2.1", "async": "~0.2.9", "optimist": "~0.5.2", "mongoose": "~3.6.20", diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js index 893e7e37d0..5747e20be0 100644 --- a/public/js/controllers/groupsCtrl.js +++ b/public/js/controllers/groupsCtrl.js @@ -47,9 +47,9 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A if(yes){ group.$removeMember({uuid: member._id}); if(isMember){ - group.members = _.without(group.members, member); + _.pull(group.members, member); }else{ - group.invites = _.without(group.invites, member); + _.pull(group.invites, member); } } } @@ -169,7 +169,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A // remove user from group members if guild is public so that he can re-join it immediately if(group.privacy == 'public'){ // slow when a lot of members...? probably yes - group.members = _.without(group.members, User.user._id); + _.remove(group.members, {_id: User.user._id}); group.memberCount--; } $state.go('options.social.guilds'); diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 1318d67a8b..6bc453b95d 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -243,7 +243,7 @@ api.deleteChatMessage = function(req, res, next){ return res.json(401, {err: "Not authorized to delete this message!"}) } - group.chat = _.without(group.chat, message); + _.pull(group.chat, message); group.save(function(err, data){ if(err) return res.json(500, {err: err});