From 138154a71c83b49c0443051ab95690b340d3fe05 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 23 Oct 2018 15:03:32 -0400 Subject: [PATCH] move modules --- src/{categories.js => categories/index.js} | 28 ++++----- src/{database.js => database/index.js} | 2 +- src/{groups.js => groups/index.js} | 36 ++++++------ src/{messaging.js => messaging/index.js} | 26 ++++----- src/{meta.js => meta/index.js} | 36 ++++++------ src/{plugins.js => plugins/index.js} | 12 ++-- src/{posts.js => posts/index.js} | 46 +++++++-------- src/{privileges.js => privileges/index.js} | 12 ++-- src/{topics.js => topics/index.js} | 54 +++++++++--------- src/{user.js => user/index.js} | 66 +++++++++++----------- 10 files changed, 160 insertions(+), 158 deletions(-) rename src/{categories.js => categories/index.js} (94%) rename src/{database.js => database/index.js} (88%) rename src/{groups.js => groups/index.js} (91%) rename src/{messaging.js => messaging/index.js} (95%) rename src/{meta.js => meta/index.js} (64%) rename src/{plugins.js => plugins/index.js} (97%) rename src/{posts.js => posts/index.js} (85%) rename src/{privileges.js => privileges/index.js} (83%) rename src/{topics.js => topics/index.js} (90%) rename src/{user.js => user/index.js} (90%) diff --git a/src/categories.js b/src/categories/index.js similarity index 94% rename from src/categories.js rename to src/categories/index.js index 388414f54f..083a4797e3 100644 --- a/src/categories.js +++ b/src/categories/index.js @@ -3,22 +3,22 @@ var async = require('async'); -var db = require('./database'); -var user = require('./user'); -var Groups = require('./groups'); -var plugins = require('./plugins'); -var privileges = require('./privileges'); +var db = require('../database'); +var user = require('../user'); +var Groups = require('../groups'); +var plugins = require('../plugins'); +var privileges = require('../privileges'); var Categories = module.exports; -require('./categories/data')(Categories); -require('./categories/create')(Categories); -require('./categories/delete')(Categories); -require('./categories/topics')(Categories); -require('./categories/unread')(Categories); -require('./categories/activeusers')(Categories); -require('./categories/recentreplies')(Categories); -require('./categories/update')(Categories); +require('./data')(Categories); +require('./create')(Categories); +require('./delete')(Categories); +require('./topics')(Categories); +require('./unread')(Categories); +require('./activeusers')(Categories); +require('./recentreplies')(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); diff --git a/src/database.js b/src/database/index.js similarity index 88% rename from src/database.js rename to src/database/index.js index f4b0a8b854..f2d1c031e2 100644 --- a/src/database.js +++ b/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)) { diff --git a/src/groups.js b/src/groups/index.js similarity index 91% rename from src/groups.js rename to src/groups/index.js index 2564ddd7dd..96b4bf2e14 100644 --- a/src/groups.js +++ b/src/groups/index.js @@ -2,26 +2,26 @@ var async = require('async'); -var user = require('./user'); -var db = require('./database'); -var plugins = require('./plugins'); -var utils = require('./utils'); +var user = require('../user'); +var db = require('../database'); +var plugins = require('../plugins'); +var utils = require('../utils'); var Groups = module.exports; -require('./groups/data')(Groups); -require('./groups/create')(Groups); -require('./groups/delete')(Groups); -require('./groups/update')(Groups); -require('./groups/membership')(Groups); -require('./groups/ownership')(Groups); -require('./groups/search')(Groups); -require('./groups/cover')(Groups); -require('./groups/posts')(Groups); -require('./groups/user')(Groups); -require('./groups/join')(Groups); -require('./groups/leave')(Groups); -require('./groups/cache')(Groups); +require('./data')(Groups); +require('./create')(Groups); +require('./delete')(Groups); +require('./update')(Groups); +require('./membership')(Groups); +require('./ownership')(Groups); +require('./search')(Groups); +require('./cover')(Groups); +require('./posts')(Groups); +require('./user')(Groups); +require('./join')(Groups); +require('./leave')(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); diff --git a/src/messaging.js b/src/messaging/index.js similarity index 95% rename from src/messaging.js rename to src/messaging/index.js index f05a3d7fea..4a68a16079 100644 --- a/src/messaging.js +++ b/src/messaging/index.js @@ -4,21 +4,21 @@ var async = require('async'); var validator = require('validator'); -var db = require('./database'); -var user = require('./user'); -var plugins = require('./plugins'); -var meta = require('./meta'); -var utils = require('./utils'); +var db = require('../database'); +var user = require('../user'); +var plugins = require('../plugins'); +var meta = require('../meta'); +var utils = require('../utils'); var Messaging = module.exports; -require('./messaging/data')(Messaging); -require('./messaging/create')(Messaging); -require('./messaging/delete')(Messaging); -require('./messaging/edit')(Messaging); -require('./messaging/rooms')(Messaging); -require('./messaging/unread')(Messaging); -require('./messaging/notifications')(Messaging); +require('./data')(Messaging); +require('./create')(Messaging); +require('./delete')(Messaging); +require('./edit')(Messaging); +require('./rooms')(Messaging); +require('./unread')(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); diff --git a/src/meta.js b/src/meta/index.js similarity index 64% rename from src/meta.js rename to src/meta/index.js index 6d5505a726..1bc79f3527 100644 --- a/src/meta.js +++ b/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 utils = require('./utils'); +var pubsub = require('../pubsub'); +var utils = require('../utils'); var Meta = module.exports; Meta.reloadRequired = false; -Meta.configs = require('./meta/configs'); -Meta.themes = require('./meta/themes'); -Meta.js = require('./meta/js'); -Meta.css = require('./meta/css'); -Meta.sounds = require('./meta/sounds'); -Meta.settings = require('./meta/settings'); -Meta.logs = require('./meta/logs'); -Meta.errors = require('./meta/errors'); -Meta.tags = require('./meta/tags'); -Meta.dependencies = require('./meta/dependencies'); -Meta.templates = require('./meta/templates'); -Meta.blacklist = require('./meta/blacklist'); -Meta.languages = require('./meta/languages'); +Meta.configs = require('./configs'); +Meta.themes = require('./themes'); +Meta.js = require('./js'); +Meta.css = require('./css'); +Meta.sounds = require('./sounds'); +Meta.settings = require('./settings'); +Meta.logs = require('./logs'); +Meta.errors = require('./errors'); +Meta.tags = require('./tags'); +Meta.dependencies = require('./dependencies'); +Meta.templates = require('./templates'); +Meta.blacklist = require('./blacklist'); +Meta.languages = require('./languages'); /* Assorted */ Meta.userOrGroupExists = function (slug, callback) { - var user = require('./user'); - var groups = require('./groups'); + var user = require('../user'); + 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); diff --git a/src/plugins.js b/src/plugins/index.js similarity index 97% rename from src/plugins.js rename to src/plugins/index.js index 0c54b6d1be..eca4a5d9dc 100644 --- a/src/plugins.js +++ b/src/plugins/index.js @@ -12,10 +12,10 @@ var middleware; var Plugins = module.exports; -require('./plugins/install')(Plugins); -require('./plugins/load')(Plugins); -require('./plugins/hooks')(Plugins); -Plugins.data = require('./plugins/data'); +require('./install')(Plugins); +require('./load')(Plugins); +require('./hooks')(Plugins); +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)-.*$/; diff --git a/src/posts.js b/src/posts/index.js similarity index 85% rename from src/posts.js rename to src/posts/index.js index 5af246d36d..fee8ce4af7 100644 --- a/src/posts.js +++ b/src/posts/index.js @@ -3,31 +3,31 @@ var async = require('async'); var _ = require('lodash'); -var db = require('./database'); -var utils = require('./utils'); -var user = require('./user'); -var topics = require('./topics'); -var privileges = require('./privileges'); -var plugins = require('./plugins'); +var db = require('../database'); +var utils = require('../utils'); +var user = require('../user'); +var topics = require('../topics'); +var privileges = require('../privileges'); +var plugins = require('../plugins'); var Posts = module.exports; -require('./posts/data')(Posts); -require('./posts/create')(Posts); -require('./posts/delete')(Posts); -require('./posts/edit')(Posts); -require('./posts/parse')(Posts); -require('./posts/user')(Posts); -require('./posts/topics')(Posts); -require('./posts/category')(Posts); -require('./posts/summary')(Posts); -require('./posts/recent')(Posts); -require('./posts/tools')(Posts); -require('./posts/votes')(Posts); -require('./posts/bookmarks')(Posts); -require('./posts/queue')(Posts); -require('./posts/diffs')(Posts); -require('./posts/uploads')(Posts); +require('./data')(Posts); +require('./create')(Posts); +require('./delete')(Posts); +require('./edit')(Posts); +require('./parse')(Posts); +require('./user')(Posts); +require('./topics')(Posts); +require('./category')(Posts); +require('./summary')(Posts); +require('./recent')(Posts); +require('./tools')(Posts); +require('./votes')(Posts); +require('./bookmarks')(Posts); +require('./queue')(Posts); +require('./diffs')(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); diff --git a/src/privileges.js b/src/privileges/index.js similarity index 83% rename from src/privileges.js rename to src/privileges/index.js index add204c029..d8eff842e3 100644 --- a/src/privileges.js +++ b/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('./privileges/categories')(privileges); -require('./privileges/topics')(privileges); -require('./privileges/posts')(privileges); -require('./privileges/users')(privileges); +require('./global')(privileges); +require('./categories')(privileges); +require('./topics')(privileges); +require('./posts')(privileges); +require('./users')(privileges); -privileges.async = require('./promisify')(privileges); +privileges.async = require('../promisify')(privileges); diff --git a/src/topics.js b/src/topics/index.js similarity index 90% rename from src/topics.js rename to src/topics/index.js index 66f2f05d98..a8e642c99c 100644 --- a/src/topics.js +++ b/src/topics/index.js @@ -3,35 +3,35 @@ var async = require('async'); var _ = require('lodash'); -var db = require('./database'); -var posts = require('./posts'); -var utils = require('./utils'); -var plugins = require('./plugins'); -var meta = require('./meta'); -var user = require('./user'); -var categories = require('./categories'); -var privileges = require('./privileges'); -var social = require('./social'); +var db = require('../database'); +var posts = require('../posts'); +var utils = require('../utils'); +var plugins = require('../plugins'); +var meta = require('../meta'); +var user = require('../user'); +var categories = require('../categories'); +var privileges = require('../privileges'); +var social = require('../social'); var Topics = module.exports; -require('./topics/data')(Topics); -require('./topics/create')(Topics); -require('./topics/delete')(Topics); -require('./topics/sorted')(Topics); -require('./topics/unread')(Topics); -require('./topics/recent')(Topics); -require('./topics/user')(Topics); -require('./topics/fork')(Topics); -require('./topics/posts')(Topics); -require('./topics/follow')(Topics); -require('./topics/tags')(Topics); -require('./topics/teaser')(Topics); -require('./topics/suggested')(Topics); -require('./topics/tools')(Topics); -require('./topics/thumb')(Topics); -require('./topics/bookmarks')(Topics); -require('./topics/merge')(Topics); +require('./data')(Topics); +require('./create')(Topics); +require('./delete')(Topics); +require('./sorted')(Topics); +require('./unread')(Topics); +require('./recent')(Topics); +require('./user')(Topics); +require('./fork')(Topics); +require('./posts')(Topics); +require('./follow')(Topics); +require('./tags')(Topics); +require('./teaser')(Topics); +require('./suggested')(Topics); +require('./tools')(Topics); +require('./thumb')(Topics); +require('./bookmarks')(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); diff --git a/src/user.js b/src/user/index.js similarity index 90% rename from src/user.js rename to src/user/index.js index 72a0d1d74c..f4e504a5cb 100644 --- a/src/user.js +++ b/src/user/index.js @@ -3,41 +3,41 @@ var async = require('async'); var _ = require('lodash'); -var groups = require('./groups'); -var plugins = require('./plugins'); -var db = require('./database'); -var privileges = require('./privileges'); -var meta = require('./meta'); +var groups = require('../groups'); +var plugins = require('../plugins'); +var db = require('../database'); +var privileges = require('../privileges'); +var meta = require('../meta'); var User = module.exports; -User.email = require('./user/email'); -User.notifications = require('./user/notifications'); -User.reset = require('./user/reset'); -User.digest = require('./user/digest'); - -require('./user/data')(User); -require('./user/auth')(User); -require('./user/bans')(User); -require('./user/create')(User); -require('./user/posts')(User); -require('./user/topics')(User); -require('./user/categories')(User); -require('./user/follow')(User); -require('./user/profile')(User); -require('./user/admin')(User); -require('./user/delete')(User); -require('./user/settings')(User); -require('./user/search')(User); -require('./user/jobs')(User); -require('./user/picture')(User); -require('./user/approval')(User); -require('./user/invite')(User); -require('./user/password')(User); -require('./user/info')(User); -require('./user/online')(User); -require('./user/blocks')(User); -require('./user/uploads')(User); +User.email = require('./email'); +User.notifications = require('./notifications'); +User.reset = require('./reset'); +User.digest = require('./digest'); + +require('./data')(User); +require('./auth')(User); +require('./bans')(User); +require('./create')(User); +require('./posts')(User); +require('./topics')(User); +require('./categories')(User); +require('./follow')(User); +require('./profile')(User); +require('./admin')(User); +require('./delete')(User); +require('./settings')(User); +require('./search')(User); +require('./jobs')(User); +require('./picture')(User); +require('./approval')(User); +require('./invite')(User); +require('./password')(User); +require('./info')(User); +require('./online')(User); +require('./blocks')(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);