mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-07 14:35:47 +01:00
Merge remote-tracking branch 'origin' into category-whitelisting
This commit is contained in:
@@ -56,6 +56,8 @@
|
||||
results.base.count = results.users.length;
|
||||
results.base.members = results.users;
|
||||
|
||||
results.base.deletable = (results.base.gid !== '1');
|
||||
|
||||
callback(err, results.base);
|
||||
});
|
||||
},
|
||||
@@ -112,7 +114,9 @@
|
||||
});
|
||||
},
|
||||
destroy: function (gid, callback) {
|
||||
RDB.hset('gid:' + gid, 'deleted', '1', callback);
|
||||
if (gid !== 1) {
|
||||
RDB.hset('gid:' + gid, 'deleted', '1', callback);
|
||||
}
|
||||
},
|
||||
join: function (gid, uid, callback) {
|
||||
RDB.sadd('gid:' + gid + ':members', uid, callback);
|
||||
|
||||
Reference in New Issue
Block a user