move modules

src/categories/index.js

@@ -3,22 +3,22 @@
 
 var async = require('async');
 
-var db = require('./database');
+var db = require('../database');
-var user = require('./user');
+var user = require('../user');
-var Groups = require('./groups');
+var Groups = require('../groups');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
-var privileges = require('./privileges');
+var privileges = require('../privileges');
 
 var Categories = module.exports;
 
-require('./categories/data')(Categories);
+require('./data')(Categories);
-require('./categories/create')(Categories);
+require('./create')(Categories);
-require('./categories/delete')(Categories);
+require('./delete')(Categories);
-require('./categories/topics')(Categories);
+require('./topics')(Categories);
-require('./categories/unread')(Categories);
+require('./unread')(Categories);
-require('./categories/activeusers')(Categories);
+require('./activeusers')(Categories);
-require('./categories/recentreplies')(Categories);
+require('./recentreplies')(Categories);
-require('./categories/update')(Categories);
+require('./update')(Categories);
 
 Categories.exists = function (cid, callback) {
 	db.isSortedSetMember('categories:cid', cid, callback);
@@ -369,4 +369,4 @@ Categories.filterIgnoringUids = function (cid, uids, callback) {
 	], callback);
 };
 
-Categories.async = require('./promisify')(Categories);
+Categories.async = require('../promisify')(Categories);

src/database/index.js

@@ -9,7 +9,7 @@ if (!databaseName) {
 	process.exit();
 }
 
-var primaryDB = require('./database/' + databaseName);
+var primaryDB = require('./' + databaseName);
 
 primaryDB.parseIntField = function (data, field) {
 	if (data.hasOwnProperty(field)) {

src/groups/index.js

@@ -2,26 +2,26 @@
 
 var async = require('async');
 
-var user = require('./user');
+var user = require('../user');
-var db = require('./database');
+var db = require('../database');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
-var utils = require('./utils');
+var utils = require('../utils');
 
 var Groups = module.exports;
 
-require('./groups/data')(Groups);
+require('./data')(Groups);
-require('./groups/create')(Groups);
+require('./create')(Groups);
-require('./groups/delete')(Groups);
+require('./delete')(Groups);
-require('./groups/update')(Groups);
+require('./update')(Groups);
-require('./groups/membership')(Groups);
+require('./membership')(Groups);
-require('./groups/ownership')(Groups);
+require('./ownership')(Groups);
-require('./groups/search')(Groups);
+require('./search')(Groups);
-require('./groups/cover')(Groups);
+require('./cover')(Groups);
-require('./groups/posts')(Groups);
+require('./posts')(Groups);
-require('./groups/user')(Groups);
+require('./user')(Groups);
-require('./groups/join')(Groups);
+require('./join')(Groups);
-require('./groups/leave')(Groups);
+require('./leave')(Groups);
-require('./groups/cache')(Groups);
+require('./cache')(Groups);
 
 
 Groups.ephemeralGroups = ['guests', 'spiders'];
@@ -273,4 +273,4 @@ Groups.existsBySlug = function (slug, callback) {
 	}
 };
 
-Groups.async = require('./promisify')(Groups);
+Groups.async = require('../promisify')(Groups);

src/messaging/index.js

@@ -4,21 +4,21 @@
 var async = require('async');
 var validator = require('validator');
 
-var db = require('./database');
+var db = require('../database');
-var user = require('./user');
+var user = require('../user');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
-var meta = require('./meta');
+var meta = require('../meta');
-var utils = require('./utils');
+var utils = require('../utils');
 
 var Messaging = module.exports;
 
-require('./messaging/data')(Messaging);
+require('./data')(Messaging);
-require('./messaging/create')(Messaging);
+require('./create')(Messaging);
-require('./messaging/delete')(Messaging);
+require('./delete')(Messaging);
-require('./messaging/edit')(Messaging);
+require('./edit')(Messaging);
-require('./messaging/rooms')(Messaging);
+require('./rooms')(Messaging);
-require('./messaging/unread')(Messaging);
+require('./unread')(Messaging);
-require('./messaging/notifications')(Messaging);
+require('./notifications')(Messaging);
 
 
 Messaging.getMessages = function (params, callback) {
@@ -384,4 +384,4 @@ Messaging.hasPrivateChat = function (uid, withUid, callback) {
 	], callback);
 };
 
-Messaging.async = require('./promisify')(Messaging);
+Messaging.async = require('../promisify')(Messaging);

src/meta/index.js

@@ -5,31 +5,31 @@ var winston = require('winston');
 var os = require('os');
 var nconf = require('nconf');
 
-var pubsub = require('./pubsub');
+var pubsub = require('../pubsub');
-var utils = require('./utils');
+var utils = require('../utils');
 
 var Meta = module.exports;
 
 Meta.reloadRequired = false;
 
-Meta.configs = require('./meta/configs');
+Meta.configs = require('./configs');
-Meta.themes = require('./meta/themes');
+Meta.themes = require('./themes');
-Meta.js = require('./meta/js');
+Meta.js = require('./js');
-Meta.css = require('./meta/css');
+Meta.css = require('./css');
-Meta.sounds = require('./meta/sounds');
+Meta.sounds = require('./sounds');
-Meta.settings = require('./meta/settings');
+Meta.settings = require('./settings');
-Meta.logs = require('./meta/logs');
+Meta.logs = require('./logs');
-Meta.errors = require('./meta/errors');
+Meta.errors = require('./errors');
-Meta.tags = require('./meta/tags');
+Meta.tags = require('./tags');
-Meta.dependencies = require('./meta/dependencies');
+Meta.dependencies = require('./dependencies');
-Meta.templates = require('./meta/templates');
+Meta.templates = require('./templates');
-Meta.blacklist = require('./meta/blacklist');
+Meta.blacklist = require('./blacklist');
-Meta.languages = require('./meta/languages');
+Meta.languages = require('./languages');
 
 /* Assorted */
 Meta.userOrGroupExists = function (slug, callback) {
-	var user = require('./user');
+	var user = require('../user');
-	var groups = require('./groups');
+	var groups = require('../groups');
 	slug = utils.slugify(slug);
 	async.parallel([
 		async.apply(user.existsBySlug, slug),
@@ -68,3 +68,5 @@ Meta.getSessionTTLSeconds = function () {
 	var ttl = ttlSeconds || ttlDays || 1209600; // Default to 14 days
 	return ttl;
 };
+
+Meta.async = require('../promisify')(Meta);

src/plugins/index.js

@@ -12,10 +12,10 @@ var middleware;
 
 var Plugins = module.exports;
 
-require('./plugins/install')(Plugins);
+require('./install')(Plugins);
-require('./plugins/load')(Plugins);
+require('./load')(Plugins);
-require('./plugins/hooks')(Plugins);
+require('./hooks')(Plugins);
-Plugins.data = require('./plugins/data');
+Plugins.data = require('./data');
 
 Plugins.getPluginPaths = Plugins.data.getPluginPaths;
 Plugins.loadPluginInfo = Plugins.data.loadPluginInfo;
@@ -113,7 +113,7 @@ Plugins.reload = function (callback) {
 };
 
 Plugins.reloadRoutes = function (router, callback) {
-	var controllers = require('./controllers');
+	var controllers = require('../controllers');
 	Plugins.fireHook('static:app.load', { app: app, router: router, middleware: middleware, controllers: controllers }, function (err) {
 		if (err) {
 			winston.error('[plugins] Encountered error while executing post-router plugins hooks', err);
@@ -243,7 +243,7 @@ Plugins.normalise = function (apiReturn, callback) {
 	});
 };
 
-Plugins.nodeModulesPath = path.join(__dirname, '../node_modules');
+Plugins.nodeModulesPath = path.join(__dirname, '../../node_modules');
 
 Plugins.showInstalled = function (callback) {
 	var pluginNamePattern = /^(@.*?\/)?nodebb-(theme|plugin|widget|rewards)-.*$/;

src/posts/index.js

@@ -3,31 +3,31 @@
 var async = require('async');
 var _ = require('lodash');
 
-var db = require('./database');
+var db = require('../database');
-var utils = require('./utils');
+var utils = require('../utils');
-var user = require('./user');
+var user = require('../user');
-var topics = require('./topics');
+var topics = require('../topics');
-var privileges = require('./privileges');
+var privileges = require('../privileges');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
 
 var Posts = module.exports;
 
-require('./posts/data')(Posts);
+require('./data')(Posts);
-require('./posts/create')(Posts);
+require('./create')(Posts);
-require('./posts/delete')(Posts);
+require('./delete')(Posts);
-require('./posts/edit')(Posts);
+require('./edit')(Posts);
-require('./posts/parse')(Posts);
+require('./parse')(Posts);
-require('./posts/user')(Posts);
+require('./user')(Posts);
-require('./posts/topics')(Posts);
+require('./topics')(Posts);
-require('./posts/category')(Posts);
+require('./category')(Posts);
-require('./posts/summary')(Posts);
+require('./summary')(Posts);
-require('./posts/recent')(Posts);
+require('./recent')(Posts);
-require('./posts/tools')(Posts);
+require('./tools')(Posts);
-require('./posts/votes')(Posts);
+require('./votes')(Posts);
-require('./posts/bookmarks')(Posts);
+require('./bookmarks')(Posts);
-require('./posts/queue')(Posts);
+require('./queue')(Posts);
-require('./posts/diffs')(Posts);
+require('./diffs')(Posts);
-require('./posts/uploads')(Posts);
+require('./uploads')(Posts);
 
 Posts.exists = function (pid, callback) {
 	db.isSortedSetMember('posts:pid', pid, callback);
@@ -206,4 +206,4 @@ Posts.modifyPostByPrivilege = function (post, privileges) {
 	}
 };
 
-Posts.async = require('./promisify')(Posts);
+Posts.async = require('../promisify')(Posts);

src/privileges/index.js

@@ -44,10 +44,10 @@ privileges.groupPrivilegeList = privileges.userPrivilegeList.map(function (privi
 
 privileges.privilegeList = privileges.userPrivilegeList.concat(privileges.groupPrivilegeList);
 
-require('./privileges/global')(privileges);
+require('./global')(privileges);
-require('./privileges/categories')(privileges);
+require('./categories')(privileges);
-require('./privileges/topics')(privileges);
+require('./topics')(privileges);
-require('./privileges/posts')(privileges);
+require('./posts')(privileges);
-require('./privileges/users')(privileges);
+require('./users')(privileges);
 
-privileges.async = require('./promisify')(privileges);
+privileges.async = require('../promisify')(privileges);

src/topics/index.js

@@ -3,35 +3,35 @@
 var async = require('async');
 var _ = require('lodash');
 
-var db = require('./database');
+var db = require('../database');
-var posts = require('./posts');
+var posts = require('../posts');
-var utils = require('./utils');
+var utils = require('../utils');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
-var meta = require('./meta');
+var meta = require('../meta');
-var user = require('./user');
+var user = require('../user');
-var categories = require('./categories');
+var categories = require('../categories');
-var privileges = require('./privileges');
+var privileges = require('../privileges');
-var social = require('./social');
+var social = require('../social');
 
 var Topics = module.exports;
 
-require('./topics/data')(Topics);
+require('./data')(Topics);
-require('./topics/create')(Topics);
+require('./create')(Topics);
-require('./topics/delete')(Topics);
+require('./delete')(Topics);
-require('./topics/sorted')(Topics);
+require('./sorted')(Topics);
-require('./topics/unread')(Topics);
+require('./unread')(Topics);
-require('./topics/recent')(Topics);
+require('./recent')(Topics);
-require('./topics/user')(Topics);
+require('./user')(Topics);
-require('./topics/fork')(Topics);
+require('./fork')(Topics);
-require('./topics/posts')(Topics);
+require('./posts')(Topics);
-require('./topics/follow')(Topics);
+require('./follow')(Topics);
-require('./topics/tags')(Topics);
+require('./tags')(Topics);
-require('./topics/teaser')(Topics);
+require('./teaser')(Topics);
-require('./topics/suggested')(Topics);
+require('./suggested')(Topics);
-require('./topics/tools')(Topics);
+require('./tools')(Topics);
-require('./topics/thumb')(Topics);
+require('./thumb')(Topics);
-require('./topics/bookmarks')(Topics);
+require('./bookmarks')(Topics);
-require('./topics/merge')(Topics);
+require('./merge')(Topics);
 
 Topics.exists = function (tid, callback) {
 	db.isSortedSetMember('topics:tid', tid, callback);
@@ -351,4 +351,4 @@ Topics.search = function (tid, term, callback) {
 	});
 };
 
-Topics.async = require('./promisify')(Topics);
+Topics.async = require('../promisify')(Topics);

src/user/index.js

@@ -3,41 +3,41 @@
 var async = require('async');
 var _ = require('lodash');
 
-var groups = require('./groups');
+var groups = require('../groups');
-var plugins = require('./plugins');
+var plugins = require('../plugins');
-var db = require('./database');
+var db = require('../database');
-var privileges = require('./privileges');
+var privileges = require('../privileges');
-var meta = require('./meta');
+var meta = require('../meta');
 
 var User = module.exports;
 
-User.email = require('./user/email');
+User.email = require('./email');
-User.notifications = require('./user/notifications');
+User.notifications = require('./notifications');
-User.reset = require('./user/reset');
+User.reset = require('./reset');
-User.digest = require('./user/digest');
+User.digest = require('./digest');
 
-require('./user/data')(User);
+require('./data')(User);
-require('./user/auth')(User);
+require('./auth')(User);
-require('./user/bans')(User);
+require('./bans')(User);
-require('./user/create')(User);
+require('./create')(User);
-require('./user/posts')(User);
+require('./posts')(User);
-require('./user/topics')(User);
+require('./topics')(User);
-require('./user/categories')(User);
+require('./categories')(User);
-require('./user/follow')(User);
+require('./follow')(User);
-require('./user/profile')(User);
+require('./profile')(User);
-require('./user/admin')(User);
+require('./admin')(User);
-require('./user/delete')(User);
+require('./delete')(User);
-require('./user/settings')(User);
+require('./settings')(User);
-require('./user/search')(User);
+require('./search')(User);
-require('./user/jobs')(User);
+require('./jobs')(User);
-require('./user/picture')(User);
+require('./picture')(User);
-require('./user/approval')(User);
+require('./approval')(User);
-require('./user/invite')(User);
+require('./invite')(User);
-require('./user/password')(User);
+require('./password')(User);
-require('./user/info')(User);
+require('./info')(User);
-require('./user/online')(User);
+require('./online')(User);
-require('./user/blocks')(User);
+require('./blocks')(User);
-require('./user/uploads')(User);
+require('./uploads')(User);
 
 User.getUidsFromSet = function (set, start, stop, callback) {
 	if (set === 'users:online') {
@@ -435,4 +435,4 @@ User.addInterstitials = function (callback) {
 	callback();
 };
 
-User.async = require('./promisify')(User);
+User.async = require('../promisify')(User);