Merge branch 'code-quality' of https://github.com/miksago/NodeBB into miksago-code-quality

Conflicts:
	src/database.js

src/categories.js

@@ -324,4 +324,4 @@ var db = require('./database'),
 
 	emitter.on('event:newpost', Categories.onNewPostMade);
 
-}(exports));
+}(exports));

src/categories/activeusers.js

@@ -80,4 +80,4 @@ module.exports = function(Categories) {
 			}
 		});
 	};
-};
+};

src/categories/update.js

@@ -43,4 +43,4 @@ module.exports = function(Categories) {
 		});
 	};
 
-};
+};

src/categoryTools.js

@@ -4,9 +4,31 @@ var	Groups = require('./groups'),
 	User = require('./user'),
 
 	async = require('async'),
-	db = require('./database'),
+	db = require('./database');
 
-	CategoryTools = {};
+var internals = {
+	isMember: function(key, candidate, next){
+		Groups.exists(key, function(err, exists) {
+			if (exists) {
+				Groups.isMember(candidate, key, next);
+			} else {
+				next(null, null);
+			}
+		});
+	},
+
+	isMemberOfGroupList: function(key, candidate, next){
+		Groups.exists(key, function(err, exists) {
+			if (exists) {
+				Groups.isMemberOfGroupList(candidate, key, next);
+			} else {
+				next(null, null);
+			}
+		});
+	}
+};
+
+var CategoryTools = {};
 
 CategoryTools.exists = function(cid, callback) {
 	db.isSortedSetMember('categories:cid', cid, callback);
@@ -15,44 +37,16 @@ CategoryTools.exists = function(cid, callback) {
 CategoryTools.privileges = function(cid, uid, callback) {
 	async.parallel({
 		"+r": function(next) {
-			var	key = 'cid:' + cid + ':privileges:+r';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMember(uid, key, next);
-				} else {
-					next(null, null);
-				}
-			});
+			internals.isMember('cid:' + cid + ':privileges:+r', uid, next);
 		},
 		"+w": function(next) {
-			var	key = 'cid:' + cid + ':privileges:+w';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMember(uid, key, next);
-				} else {
-					next(null, null);
-				}
-			});
+			internals.isMember('cid:' + cid + ':privileges:+w', uid, next);
 		},
 		"g+r": function(next) {
-			var	key = 'cid:' + cid + ':privileges:g+r';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMemberOfGroupList(uid, key, next);
-				} else {
-					next(null, null);
-				}
-			});
+			internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+r', uid, next);
 		},
 		"g+w": function(next) {
-			var	key = 'cid:' + cid + ':privileges:g+w';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMemberOfGroupList(uid, key, next);
-				} else {
-					next(null, null);
-				}
-			});
+			internals.isMemberOfGroupList('cid:' + cid + ':privileges:g+w', uid, next);
 		},
 		moderator: function(next) {
 			User.isModerator(uid, cid, next);
@@ -93,23 +87,13 @@ CategoryTools.privileges = function(cid, uid, callback) {
 CategoryTools.groupPrivileges = function(cid, groupName, callback) {
 	async.parallel({
 		"g+r": function(next) {
-			var	key = 'cid:' + cid + ':privileges:g+r';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMember(groupName, key, next);
-				} else {
-					next(null, false);
-				}
+			internals.isMember('cid:' + cid + ':privileges:g+r', groupName, function(err, isMember){
+				next(err, !!isMember);
 			});
 		},
 		"g+w": function(next) {
-			var	key = 'cid:' + cid + ':privileges:g+w';
-			Groups.exists(key, function(err, exists) {
-				if (exists) {
-					Groups.isMember(groupName, key, next);
-				} else {
-					next(null, false);
-				}
+			internals.isMember('cid:' + cid + ':privileges:g+w', groupName, function(err, isMember){
+				next(err, !!isMember);
 			});
 		}
 	}, function(err, privileges) {

src/controllers/accounts.js

@@ -468,4 +468,4 @@ accountsController.getNotifications = function(req, res, next) {
 	});
 };
 
-module.exports = accountsController;
+module.exports = accountsController;

src/controllers/admin.js

@@ -169,4 +169,4 @@ adminController.sounds.get = function(req, res, next) {
 	});
 };
 
-module.exports = adminController;
+module.exports = adminController;

src/controllers/admin/users.js

@@ -47,4 +47,4 @@ usersController.getCSV = function(req, res, next) {
 	});
 };
 
-module.exports = usersController;
+module.exports = usersController;

src/controllers/api.js

@@ -70,4 +70,4 @@ apiController.getConfig = function(req, res, next) {
 };
 
 
-module.exports = apiController;
+module.exports = apiController;

src/controllers/index.js

@@ -266,4 +266,4 @@ Controllers.outgoing = function(req, res, next) {
 	}
 };
 
-module.exports = Controllers;
+module.exports = Controllers;

src/controllers/topics.js

@@ -181,4 +181,4 @@ topicsController.get = function(req, res, next) {
 	});
 };
 
-module.exports = topicsController;
+module.exports = topicsController;

src/controllers/users.js

@@ -100,4 +100,4 @@ usersController.getUsersForSearch = function(req, res, next) {
 
 
 
-module.exports = usersController;
+module.exports = usersController;

src/emailer.js

@@ -50,4 +50,4 @@ Emailer.send = function(template, uid, params) {
 	});
 };
 
-module.exports = Emailer;
+module.exports = Emailer;

src/emitter.js

@@ -1,4 +1,4 @@
 var events = require('events'),
 	eventEmitter = new events.EventEmitter();
 
-module.exports = eventEmitter;
+module.exports = eventEmitter;

src/events.js

@@ -113,4 +113,4 @@ var fs = require('fs'),
 		});
 	};
 
-}(module.exports));
+}(module.exports));

src/favourites.js

@@ -217,4 +217,4 @@ var async = require('async'),
 		}, callback);
 	};
 
-}(exports));
+}(exports));

src/image.js

@@ -44,4 +44,4 @@ image.convertImageToBase64 = function(path, callback) {
 	});
 };
 
-module.exports = image;
+module.exports = image;

src/install.js

@@ -429,4 +429,4 @@ install.save = function (server_conf, callback) {
 	});
 };
 
-module.exports = install;
+module.exports = install;

src/languages.js

@@ -42,4 +42,4 @@ Languages.list = function(callback) {
 	});
 };
 
-module.exports = Languages;
+module.exports = Languages;

src/messaging.js

@@ -147,4 +147,4 @@ var db = require('./database'),
 		});
 	};
 
-}(exports));
+}(exports));

src/middleware/admin.js

@@ -89,4 +89,4 @@ middleware.buildHeader = function(req, res, next) {
 module.exports = function(webserver) {
 	app = webserver;
 	return middleware;
-};
+};

src/middleware/index.js

@@ -217,4 +217,4 @@ module.exports = function(app, data) {
 	});
 
 	return middleware;
-};
+};

src/middleware/middleware.js

@@ -345,4 +345,4 @@ module.exports = function(webserver) {
 	middleware.admin = require('./admin')(webserver);
 
 	return middleware;
-};
+};

src/plugins.js

@@ -72,25 +72,21 @@ var fs = require('fs'),
 				db.getSetMembers('plugins:active', next);
 			},
 			function(plugins, next) {
-				if (plugins && Array.isArray(plugins)) {
-					plugins.push(meta.config['theme:id']);
+				if (!plugins || !Array.isArray(plugins)) {
+					next();
+				}
 
-					async.each(plugins, function(plugin, next) {
-						if (!plugin || typeof plugin !== 'string') {
-							return next();
-						}
+				plugins.push(meta.config['theme:id']);
 
-						var modulePath = path.join(__dirname, '../node_modules/', plugin);
-						if (fs.existsSync(modulePath)) {
-							Plugins.loadPlugin(modulePath, next);
-						} else {
-							if (global.env === 'development') {
-								winston.warn('[plugins] Plugin \'' + plugin + '\' not found');
-							}
-							next(); // Ignore this plugin silently
-						}
-					}, next);
-				} else next();
+				plugins = plugins.filter(function(plugin){
+					return plugin && typeof plugin === 'string';
+				}).map(function(plugin){
+					return path.join(__dirname, '../node_modules/', plugin);
+				});
+
+				async.filter(plugins, fs.exists, function(plugins){
+					async.each(plugins, Plugins.loadPlugin, next);
+				});
 			},
 			function(next) {
 				if (global.env === 'development') winston.info('[plugins] Sorting hooks to fire in priority sequence');
@@ -434,28 +430,31 @@ var fs = require('fs'),
 	};
 
 	Plugins.showInstalled = function(callback) {
-		npmPluginPath = path.join(__dirname, '../node_modules');
+		var npmPluginPath = path.join(__dirname, '../node_modules');
 
 		async.waterfall([
-			function(next) {
-				fs.readdir(npmPluginPath, function(err, dirs) {
-					dirs = dirs.map(function(file) {
-						return path.join(npmPluginPath, file);
-					}).filter(function(file) {
-						if (fs.existsSync(file)) {
-							var stats = fs.statSync(file),
-								isPlugin =  file.substr(npmPluginPath.length + 1, 14) === 'nodebb-plugin-' || file.substr(npmPluginPath.length + 1, 14) === 'nodebb-widget-';
+			async.apply(fs.readdir, npmPluginPath),
 
-							if (stats.isDirectory() && isPlugin) return true;
-							else return false;
-						} else {
-							return false;
+			function(dirs, next) {
+				dirs = dirs.filter(function(dir){
+					return dir.substr(0, 14) === 'nodebb-plugin-' || dir.substr(0, 14) === 'nodebb-widget-';
+				}).map(function(dir){
+					return path.join(npmPluginPath, dir);
+				});
+
+				async.filter(dirs, function(dir, callback){
+					fs.stat(dir, function(err, stats){
+						if (err) {
+							return callback(false);
 						}
-					});
 
-					next(err, dirs);
+						callback(stats.isDirectory());
+					})
+				}, function(plugins){
+					next(null, plugins);
 				});
 			},
+
 			function(files, next) {
 				var plugins = [];
 

src/routes/authentication.js

@@ -214,4 +214,4 @@
 			uid: uid
 		});
 	});
-}(exports));
+}(exports));

src/routes/debug.js

@@ -58,4 +58,4 @@ module.exports = function(app, middleware, controllers) {
 			res.send(200);
 		});
 	});
-};
+};

src/routes/feeds.js

@@ -166,4 +166,4 @@ module.exports = function(app, middleware, controllers){
 	app.get('/category/:category_id.rss', hasCategoryPrivileges, generateForCategory);
 	app.get('/recent.rss', generateForRecent);
 	app.get('/popular.rss', generateForPopular);
-};
+};

src/routes/index.js

@@ -152,4 +152,4 @@ module.exports = function(app, middleware) {
 			require('./debug')(app, middleware, controllers);
 		}
 	});
-};
+};

src/routes/plugins.js

@@ -51,4 +51,4 @@ module.exports = function(app, middleware, controllers) {
 			res.redirect('/404');
 		}
 	});
-};
+};

src/sitemap.js

@@ -88,4 +88,4 @@ var path = require('path'),
 		}
 	};
 
-module.exports = sitemap;
+module.exports = sitemap;

src/socket.io/categories.js

@@ -47,4 +47,4 @@ SocketCategories.getTopicCount = function(socket, cid, callback) {
 	categories.getCategoryField(cid, 'topic_count', callback);
 };
 
-module.exports = SocketCategories;
+module.exports = SocketCategories;

src/socket.io/index.js

@@ -319,4 +319,4 @@ function emitOnlineUserCount(callback) {
 
 
 /* Exporting */
-module.exports = Sockets;
+module.exports = Sockets;

src/socket.io/meta.js

@@ -111,4 +111,4 @@ SocketMeta.rooms.getAll = function(socket, data, callback) {
 
 /* Exports */
 
-module.exports = SocketMeta;
+module.exports = SocketMeta;

src/socket.io/modules.js

@@ -231,4 +231,4 @@ SocketModules.sounds.getMapping = function(socket, data, callback) {
 	meta.sounds.getMapping(callback);
 };
 
-module.exports = SocketModules;
+module.exports = SocketModules;

src/socket.io/notifications.js

@@ -12,4 +12,4 @@ SocketNotifs.getCount = function(socket, data, callback) {
 	user.notifications.getUnreadCount(socket.uid, callback);
 };
 
-module.exports = SocketNotifs;
+module.exports = SocketNotifs;

src/socket.io/posts.js

@@ -318,4 +318,4 @@ SocketPosts.getCategory = function(socket, pid, callback) {
 	posts.getCidByPid(pid, callback);
 };
 
-module.exports = SocketPosts;
+module.exports = SocketPosts;

src/socket.io/tools.js

@@ -6,4 +6,4 @@ SocketTools.log = function(socket, data, callback) {
 	//winston.info("captured console.log:", data)
 };
 
-module.exports = SocketTools;
+module.exports = SocketTools;

src/socket.io/topics.js

@@ -313,4 +313,4 @@ SocketTopics.getTidIndex = function(socket, tid, callback) {
 	categories.getTopicIndex(tid, callback);
 };
 
-module.exports = SocketTopics;
+module.exports = SocketTopics;

src/socket.io/user.js

@@ -248,4 +248,4 @@ SocketUser.setStatus = function(socket, status, callback) {
 
 /* Exports */
 
-module.exports = SocketUser;
+module.exports = SocketUser;

src/socket.io/widgets.js

@@ -8,4 +8,4 @@ SocketWidgets.render = function(socket, data, callback) {
 	widgets.render(socket.uid, data, callback);
 };
 
-module.exports = SocketWidgets;
+module.exports = SocketWidgets;

src/threadTools.js

@@ -293,4 +293,4 @@ var winston = require('winston'),
 			});
 		});
 	};
-}(exports));
+}(exports));

src/topics.js

@@ -478,4 +478,4 @@ var async = require('async'),
 			});
 		});
 	};
-}(exports));
+}(exports));

src/topics/create.js

@@ -219,4 +219,4 @@ module.exports = function(Topics) {
 		], callback);
 	};
 
-};
+};

src/topics/fork.js

@@ -99,4 +99,4 @@ module.exports = function(Topics) {
 			});
 		});
 	};
-};
+};

src/topics/unread.js

@@ -223,4 +223,4 @@ module.exports = function(Topics) {
 	};
 
 
-};
+};

src/upgrade.js

@@ -628,4 +628,4 @@ Upgrade.upgrade = function(callback) {
 	});
 };
 
-module.exports = Upgrade;
+module.exports = Upgrade;

src/user/create.js

@@ -141,4 +141,4 @@ module.exports = function(User) {
 			});
 		});
 	};
-};
+};

src/user/follow.js

@@ -65,4 +65,4 @@ module.exports = function(User) {
 		db.isSetMember('following:' + uid, theirid, callback);
 	};
 
-};
+};

src/user/notifications.js

@@ -180,4 +180,4 @@ var async = require('async'),
 		});
 	};
 
-}(exports));
+}(exports));

src/user/profile.js

@@ -253,4 +253,4 @@ module.exports = function(User) {
 		}
 	};
 
-};
+};

src/user/reset.js

@@ -89,4 +89,4 @@ var async = require('async'),
 		});
 	};
 
-}(exports));
+}(exports));

src/user/search.js

@@ -41,4 +41,3 @@ module.exports = function(User) {
 		});
 	};
 };
-

src/user/settings.js

@@ -52,4 +52,4 @@ module.exports = function(User) {
 			language: data.language || meta.config.defaultLang
 		}, callback);
 	};
-};
+};

src/widgets.js

@@ -99,4 +99,4 @@ var async = require('async'),
 		});
 	};
 
-}(exports));
+}(exports));