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

doggy.gif

Browse Source
This commit is contained in:
barisusakli
2015-03-19 22:59:12 -04:00
parent a51b7257c7
commit 9d62709f7c
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/groups.js
View File

@@ -440,7 +440,6 @@ var async = require('async'),
return ephemeralGroups.indexOf(slug) !== -1; return ephemeralGroups.indexOf(slug) !== -1;
})); }));
}, },
async.apply(db.isObjectFields, 'groupslug:groupname', slugs),
async.apply(db.isSortedSetMembers, 'groups:createtime', name) async.apply(db.isSortedSetMembers, 'groups:createtime', name)
], function(err, results) { ], function(err, results) {
if (err) { if (err) {
@@ -448,7 +447,7 @@ var async = require('async'),
} }
callback(null, results.map(function(result) { callback(null, results.map(function(result) {
return result[0] || result[1] || result[2]; return result[0] || result[1];
})); }));
}); });
} else { } else {
@@ -457,16 +456,19 @@ var async = require('async'),
function(next) { function(next) {
next(null, ephemeralGroups.indexOf(slug) !== -1); next(null, ephemeralGroups.indexOf(slug) !== -1);
}, },
async.apply(db.isObjectField, 'groupslug:groupname', slug),
async.apply(db.isSortedSetMember, 'groups:createtime', name) async.apply(db.isSortedSetMember, 'groups:createtime', name)
], function(err, results) { ], function(err, results) {
callback(err, !err ? (results[0] || results[1] || results[2]) : null); callback(err, !err ? (results[0] || results[1]) : null);
}); });
} }
}; };
Groups.existsBySlug = function(slug, callback) { Groups.existsBySlug = function(slug, callback) {
db.isObjectField('groupslug:groupname', slug, callback); if (Array.isArray(slug)) {
db.isObjectFields('groupslug:groupName', slug, callback);
} else {
db.isObjectField('groupslug:groupname', slug, callback);
}
}; };
Groups.create = function(data, callback) { Groups.create = function(data, callback) {

2
src/meta.js
View File

@@ -29,7 +29,7 @@ var async = require('async'),
Meta.userOrGroupExists = function(slug, callback) { Meta.userOrGroupExists = function(slug, callback) {
async.parallel([ async.parallel([
async.apply(user.exists, slug), async.apply(user.exists, slug),
async.apply(groups.exists, slug) async.apply(groups.existsBySlug, slug)
], function(err, results) { ], function(err, results) {
callback(err, results ? results.some(function(result) { return result; }) : false); callback(err, results ? results.some(function(result) { return result; }) : false);
}); });