Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-05 05:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

if you attempt to join a group when you're already in a group, you can't anymore.

Browse Source
This commit is contained in:
Julian Lam
2015-01-16 20:14:39 -05:00
parent 8ba05c08fe
commit 04be40158c
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/error.json
View File

@@ -65,6 +65,7 @@
"group-name-too-short": "Group name too short",
"group-already-exists": "Group already exists",
"group-name-change-not-allowed": "Group name change not allowed",
"group-already-member": "You are already part of this group",
"post-already-deleted": "This post has already been deleted",
"post-already-restored": "This post has already been restored",

11
src/groups.js
View File

@@ -615,6 +615,16 @@ var async = require('async'),
};
Groups.requestMembership = function(groupName, uid, callback) {
async.parallel({
exists: async.apply(Groups.isMember, uid, groupName),
isMember: async.apply(Groups.exists, groupName)
}, function(err, checks) {
if (!checks.exists) {
return callback(new Error('[[error:no-group]]'));
} else if (checks.isMember) {
return callback(new Error('[[error:group-already-member]]'));
}
if (parseInt(uid, 10) > 0) {
db.setAdd('group:' + groupName + ':pending', uid, callback);
plugins.fireHook('action:group.requestMembership', {
@@ -624,6 +634,7 @@ var async = require('async'),
} else {
callback(new Error('[[error:not-logged-in]]'));
}
});
};
Groups.acceptMembership = function(groupName, uid, callback) {