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

hinting

Browse Source
This commit is contained in:
psychobunny
2013-09-18 10:50:02 -04:00
parent cf4ba9d1d3
commit 28704a6164
3 changed files with 130 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/groups.js
View File

@@ -1,3 +1,6 @@
(function () {
"use strict";
var async = require('async'), var async = require('async'),
User = require('./user'), User = require('./user'),
RDB = RDB || require('./redis'), RDB = RDB || require('./redis'),
@@ -11,11 +14,16 @@ var async = require('async'),
}, next); }, next);
}, function (err, groups) { }, function (err, groups) {
callback(err, groups.filter(function (group) { callback(err, groups.filter(function (group) {
if (group.deleted === '1') return false; if (group.deleted === '1') {
else return true; return false;
} else {
return true;
}
})); }));
}); });
} else callback(null, []); } else {
callback(null, []);
}
}); });
}, },
get: function (gid, options, callback) { get: function (gid, options, callback) {
@@ -26,18 +34,24 @@ var async = require('async'),
users: function (next) { users: function (next) {
RDB.smembers('gid:' + gid + ':members', function (err, uids) { RDB.smembers('gid:' + gid + ':members', function (err, uids) {
if (options.expand) { if (options.expand) {
if (err) return next(err); if (err) {
return next(err);
}
async.map(uids, function (uid, next) { async.map(uids, function (uid, next) {
User.getUserData(uid, next); User.getUserData(uid, next);
}, function (err, users) { }, function (err, users) {
next(err, users); next(err, users);
}); });
} else next(err, uids); } else {
next(err, uids);
}
}); });
} }
}, function (err, results) { }, function (err, results) {
if (err) return callback(err); if (err) {
return callback(err);
}
results.base.count = results.users.length; results.base.count = results.users.length;
results.base.members = results.users; results.base.members = results.users;
@@ -55,7 +69,9 @@ var async = require('async'),
RDB.hexists('group:gid', name, callback); RDB.hexists('group:gid', name, callback);
}, },
create: function (name, description, callback) { create: function (name, description, callback) {
if (name.length === 0) return callback(new Error('name-too-short')); if (name.length === 0) {
return callback(new Error('name-too-short'));
}
Groups.exists(name, function (err, exists) { Groups.exists(name, function (err, exists) {
if (!exists) { if (!exists) {
@@ -72,13 +88,18 @@ var async = require('async'),
Groups.get(gid, {}, callback); Groups.get(gid, {}, callback);
}); });
}); });
} else callback(new Error('group-exists')) } else {
callback(new Error('group-exists'));
}
}); });
}, },
update: function (gid, values, callback) { update: function (gid, values, callback) {
RDB.exists('gid:' + gid, function (err, exists) { RDB.exists('gid:' + gid, function (err, exists) {
if (!err && exists) RDB.hmset('gid:' + gid, values, callback); if (!err && exists) {
else calback(new Error('gid-not-found')); RDB.hmset('gid:' + gid, values, callback);
} else {
callback(new Error('gid-not-found'));
}
}); });
}, },
destroy: function (gid, callback) { destroy: function (gid, callback) {
@@ -93,3 +114,4 @@ var async = require('async'),
}; };
module.exports = Groups; module.exports = Groups;
}());

6
src/imgur.js
View File

@@ -2,6 +2,8 @@ var request = require('request');
(function (imgur) { (function (imgur) {
"use strict";
var clientID = ''; var clientID = '';
imgur.upload = function (image, type, callback) { imgur.upload = function (image, type, callback) {
@@ -24,10 +26,10 @@ var request = require('request');
type: type, type: type,
image: image image: image
}); });
} };
imgur.setClientID = function (id) { imgur.setClientID = function (id) {
clientID = id; clientID = id;
} };
}(exports)); }(exports));