hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
v1.18.x
Barış Soner Uşaklı 9 years ago
parent f57b5f4e4c
commit 2faf175739
7 changed files with 230 additions and 250 deletions
Show Stats Download Patch File Download Diff File

77
src/groups/delete.js
Unescape Escape View File

@ -8,45 +8,48 @@ var batch = require('../batch');
module.exports = function (Groups) {
Groups.destroy = function (groupName, callback) {
Groups.getGroupsData([groupName], function (err, groupsData) {
if (err) {
return callback(err);
}
if (!Array.isArray(groupsData) || !groupsData[0]) {
return callback();
}
var groupObj = groupsData[0];
async.parallel([
async.apply(db.delete, 'group:' + groupName),
async.apply(db.sortedSetRemove, 'groups:createtime', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:createtime', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:memberCount', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:name', groupName.toLowerCase() + ':' + groupName),
async.apply(db.delete, 'group:' + groupName + ':members'),
async.apply(db.delete, 'group:' + groupName + ':pending'),
async.apply(db.delete, 'group:' + groupName + ':invited'),
async.apply(db.delete, 'group:' + groupName + ':owners'),
async.apply(db.delete, 'group:' + groupName + ':member:pids'),
async.apply(db.deleteObjectField, 'groupslug:groupname', utils.slugify(groupName)),
function (next) {
batch.processSortedSet('groups:createtime', function (groupNames, next) {
var keys = groupNames.map(function (group) {
return 'group:' + group + ':members';
});
db.sortedSetsRemove(keys, groupName, next);
}, {
batch: 500,
}, next);
},
], function (err) {
if (err) {
return callback(err);
var groupObj;
async.waterfall([
function (next) {
Groups.getGroupsData([groupName], next);
},
function (groupsData, next) {
if (!Array.isArray(groupsData) || !groupsData[0]) {
return callback();
}
groupObj = groupsData[0];
async.parallel([
async.apply(db.delete, 'group:' + groupName),
async.apply(db.sortedSetRemove, 'groups:createtime', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:createtime', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:memberCount', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:name', groupName.toLowerCase() + ':' + groupName),
async.apply(db.delete, 'group:' + groupName + ':members'),
async.apply(db.delete, 'group:' + groupName + ':pending'),
async.apply(db.delete, 'group:' + groupName + ':invited'),
async.apply(db.delete, 'group:' + groupName + ':owners'),
async.apply(db.delete, 'group:' + groupName + ':member:pids'),
async.apply(db.deleteObjectField, 'groupslug:groupname', utils.slugify(groupName)),
function (next) {
batch.processSortedSet('groups:createtime', function (groupNames, next) {
var keys = groupNames.map(function (group) {
return 'group:' + group + ':members';
});
db.sortedSetsRemove(keys, groupName, next);
}, {
batch: 500,
}, next);
},
], function (err) {
next(err);
});
},
function (next) {
Groups.resetCache();
plugins.fireHook('action:group.destroy', { group: groupObj });
callback();
});
});
next();
},
], callback);
};
};

15
src/groups/membership.js
Unescape Escape View File

@ -287,13 +287,14 @@ module.exports = function (Groups) {
Groups.getMemberUsers = function (groupNames, start, stop, callback) {
async.map(groupNames, function (groupName, next) {
Groups.getMembers(groupName, start, stop, function (err, uids) {
if (err) {
return next(err);
}
user.getUsersFields(uids, ['uid', 'username', 'picture', 'userslug'], next);
});
async.waterfall([
function (next) {
Groups.getMembers(groupName, start, stop, next);
},
function (uids, next) {
user.getUsersFields(uids, ['uid', 'username', 'picture', 'userslug'], next);
},
], next);
}, callback);
};

31
src/meta/blacklist.js
Unescape Escape View File

@ -13,27 +13,24 @@ var Blacklist = {
Blacklist.load = function (callback) {
callback = callback || function () {};
async.waterfall([
Blacklist.get,
Blacklist.validate,
], function (err, rules) {
if (err) {
return callback(err);
}
function (rules, next) {
winston.verbose('[meta/blacklist] Loading ' + rules.valid.length + ' blacklist rules');
if (rules.invalid.length) {
winston.warn('[meta/blacklist] ' + rules.invalid.length + ' invalid blacklist rule(s) were ignored.');
}
winston.verbose('[meta/blacklist] Loading ' + rules.valid.length + ' blacklist rules');
if (rules.invalid.length) {
winston.warn('[meta/blacklist] ' + rules.invalid.length + ' invalid blacklist rule(s) were ignored.');
}
Blacklist._rules = {
ipv4: rules.ipv4,
ipv6: rules.ipv6,
cidr: rules.cidr,
};
callback();
});
Blacklist._rules = {
ipv4: rules.ipv4,
ipv6: rules.ipv6,
cidr: rules.cidr,
};
next();
},
], callback);
};
pubsub.on('blacklist:reload', Blacklist.load);

16
src/meta/cacheBuster.js
Unescape Escape View File

@ -1,5 +1,6 @@
'use strict';
var async = require('async');
var fs = require('fs');
var path = require('path');
var mkdirp = require('mkdirp');
@ -15,13 +16,14 @@ function generate() {
}
exports.write = function write(callback) {
mkdirp(path.dirname(filePath), function (err) {
if (err) {
return callback(err);
}
fs.writeFile(filePath, generate(), callback);
});
async.waterfall([
function (next) {
mkdirp(path.dirname(filePath), next);
},
function (data, next) {
fs.writeFile(filePath, generate(), next);
},
], callback);
};
exports.read = function read(callback) {

9
src/meta/logs.js
Unescape Escape View File

@ -2,7 +2,6 @@
var path = require('path');
var fs = require('fs');
var winston = require('winston');
module.exports = function (Meta) {
Meta.logs = {
@ -12,13 +11,7 @@ module.exports = function (Meta) {
Meta.logs.get = function (callback) {
fs.readFile(Meta.logs.path, {
encoding: 'utf-8',
}, function (err, logs) {
if (err) {
winston.error('[meta/logs] Could not retrieve logs: ' + err.message);
}
callback(undefined, logs || '');
});
}, callback);
};
Meta.logs.clear = function (callback) {

234
src/meta/templates.js
Unescape Escape View File

@ -11,100 +11,11 @@ var nconf = require('nconf');
var plugins = require('../plugins');
var file = require('../file');
var Templates = {};
var Templates = module.exports;
Templates.compile = function (callback) {
callback = callback || function () {};
compile(callback);
};
function getBaseTemplates(theme) {
var baseTemplatesPaths = [];
var baseThemePath;
var baseThemeConfig;
while (theme) {
baseThemePath = path.join(nconf.get('themes_path'), theme);
baseThemeConfig = require(path.join(baseThemePath, 'theme.json'));
baseTemplatesPaths.push(path.join(baseThemePath, baseThemeConfig.templates || 'templates'));
theme = baseThemeConfig.baseTheme;
}
return baseTemplatesPaths.reverse();
}
function preparePaths(baseTemplatesPaths, callback) {
var coreTemplatesPath = nconf.get('core_templates_path');
var viewsPath = nconf.get('views_dir');
async.waterfall([
function (next) {
rimraf(viewsPath, next);
},
function (next) {
mkdirp(viewsPath, next);
},
function (viewsPath, next) {
plugins.fireHook('static:templates.precompile', {}, next);
},
function (next) {
plugins.getTemplates(next);
},
], function (err, pluginTemplates) {
if (err) {
return callback(err);
}
winston.verbose('[meta/templates] Compiling templates');
async.parallel({
coreTpls: function (next) {
file.walk(coreTemplatesPath, next);
},
baseThemes: function (next) {
async.map(baseTemplatesPaths, function (baseTemplatePath, next) {
file.walk(baseTemplatePath, function (err, paths) {
paths = paths.map(function (tpl) {
return {
base: baseTemplatePath,
path: tpl.replace(baseTemplatePath, ''),
};
});
next(err, paths);
});
}, next);
},
}, function (err, data) {
var baseThemes = data.baseThemes;
var coreTpls = data.coreTpls;
var paths = {};
coreTpls.forEach(function (el, i) {
paths[coreTpls[i].replace(coreTemplatesPath, '')] = coreTpls[i];
});
baseThemes.forEach(function (baseTpls) {
baseTpls.forEach(function (el, i) {
paths[baseTpls[i].path] = path.join(baseTpls[i].base, baseTpls[i].path);
});
});
for (var tpl in pluginTemplates) {
if (pluginTemplates.hasOwnProperty(tpl)) {
paths[tpl] = pluginTemplates[tpl];
}
}
callback(err, paths);
});
});
}
function compile(callback) {
var themeConfig = require(nconf.get('theme_config'));
var baseTemplatesPaths = themeConfig.baseTheme ? getBaseTemplates(themeConfig.baseTheme) : [nconf.get('base_templates_path')];
var viewsPath = nconf.get('views_dir');
@ -138,40 +49,117 @@ function compile(callback) {
}
}
preparePaths(baseTemplatesPaths, function (err, paths) {
if (err) {
return callback(err);
}
async.each(Object.keys(paths), function (relativePath, next) {
async.waterfall([
function (next) {
fs.readFile(paths[relativePath], next);
},
function (file, next) {
var source = file.toString();
processImports(paths, relativePath, source, next);
},
function (compiled, next) {
mkdirp(path.join(viewsPath, path.dirname(relativePath)), function (err) {
next(err, compiled);
});
},
function (compiled, next) {
fs.writeFile(path.join(viewsPath, relativePath), compiled, next);
},
], next);
}, function (err) {
if (err) {
winston.error('[meta/templates] ' + err.stack);
return callback(err);
}
async.waterfall([
function (next) {
preparePaths(baseTemplatesPaths, next);
},
function (paths, next) {
async.each(Object.keys(paths), function (relativePath, next) {
async.waterfall([
function (next) {
fs.readFile(paths[relativePath], next);
},
function (file, next) {
var source = file.toString();
processImports(paths, relativePath, source, next);
},
function (compiled, next) {
mkdirp(path.join(viewsPath, path.dirname(relativePath)), function (err) {
next(err, compiled);
});
},
function (compiled, next) {
fs.writeFile(path.join(viewsPath, relativePath), compiled, next);
},
], next);
}, next);
},
function (next) {
winston.verbose('[meta/templates] Successfully compiled templates.');
next();
},
], callback);
};
callback();
});
});
function getBaseTemplates(theme) {
var baseTemplatesPaths = [];
var baseThemePath;
var baseThemeConfig;
while (theme) {
baseThemePath = path.join(nconf.get('themes_path'), theme);
baseThemeConfig = require(path.join(baseThemePath, 'theme.json'));
baseTemplatesPaths.push(path.join(baseThemePath, baseThemeConfig.templates || 'templates'));
theme = baseThemeConfig.baseTheme;
}
return baseTemplatesPaths.reverse();
}
module.exports = Templates;
function preparePaths(baseTemplatesPaths, callback) {
var coreTemplatesPath = nconf.get('core_templates_path');
var viewsPath = nconf.get('views_dir');
var pluginTemplates;
async.waterfall([
function (next) {
rimraf(viewsPath, next);
},
function (next) {
mkdirp(viewsPath, next);
},
function (viewsPath, next) {
plugins.fireHook('static:templates.precompile', {}, next);
},
function (next) {
plugins.getTemplates(next);
},
function (_pluginTemplates, next) {
pluginTemplates = _pluginTemplates;
winston.verbose('[meta/templates] Compiling templates');
async.parallel({
coreTpls: function (next) {
file.walk(coreTemplatesPath, next);
},
baseThemes: function (next) {
async.map(baseTemplatesPaths, function (baseTemplatePath, next) {
file.walk(baseTemplatePath, function (err, paths) {
paths = paths.map(function (tpl) {
return {
base: baseTemplatePath,
path: tpl.replace(baseTemplatePath, ''),
};
});
next(err, paths);
});
}, next);
},
}, next);
},
function (data, next) {
var baseThemes = data.baseThemes;
var coreTpls = data.coreTpls;
var paths = {};
coreTpls.forEach(function (el, i) {
paths[coreTpls[i].replace(coreTemplatesPath, '')] = coreTpls[i];
});
baseThemes.forEach(function (baseTpls) {
baseTpls.forEach(function (el, i) {
paths[baseTpls[i].path] = path.join(baseTpls[i].base, baseTpls[i].path);
});
});
for (var tpl in pluginTemplates) {
if (pluginTemplates.hasOwnProperty(tpl)) {
paths[tpl] = pluginTemplates[tpl];
}
}
next(null, paths);
},
], callback);
}

98
src/meta/themes.js
Unescape Escape View File

@ -19,27 +19,25 @@ module.exports = function (Meta) {
return callback(null, []);
}
fs.readdir(themePath, function (err, files) {
if (err) {
return callback(err);
}
async.filter(files, function (file, next) {
fs.stat(path.join(themePath, file), function (err, fileStat) {
if (err) {
if (err.code === 'ENOENT') {
return next(null, false);
async.waterfall([
function (next) {
fs.readdir(themePath, next);
},
function (files, next) {
async.filter(files, function (file, next) {
fs.stat(path.join(themePath, file), function (err, fileStat) {
if (err) {
if (err.code === 'ENOENT') {
return next(null, false);
}
return next(err);
}
return next(err);
}
next(null, (fileStat.isDirectory() && file.slice(0, 13) === 'nodebb-theme-'));
});
}, function (err, themes) {
if (err) {
return callback(err);
}
next(null, (fileStat.isDirectory() && file.slice(0, 13) === 'nodebb-theme-'));
});
}, next);
},
function (themes, next) {
async.map(themes, function (theme, next) {
var config = path.join(themePath, theme, 'theme.json');
@ -66,16 +64,13 @@ module.exports = function (Meta) {
next(null, null);
}
});
}, function (err, themes) {
if (err) {
return callback(err);
}
themes = themes.filter(Boolean);
callback(null, themes);
});
});
});
}, next);
},
function (themes, next) {
themes = themes.filter(Boolean);
next(null, themes);
},
], callback);
};
Meta.themes.set = function (data, callback) {
@ -134,33 +129,34 @@ module.exports = function (Meta) {
};
Meta.themes.setupPaths = function (callback) {
async.parallel({
themesData: Meta.themes.get,
currentThemeId: function (next) {
db.getObjectField('config', 'theme:id', next);
async.waterfall([
function (next) {
async.parallel({
themesData: Meta.themes.get,
currentThemeId: function (next) {
db.getObjectField('config', 'theme:id', next);
},
}, next);
},
}, function (err, data) {
if (err) {
return callback(err);
}
function (data, next) {
var themeId = data.currentThemeId || 'nodebb-theme-persona';
var themeId = data.currentThemeId || 'nodebb-theme-persona';
var themeObj = data.themesData.filter(function (themeObj) {
return themeObj.id === themeId;
})[0];
var themeObj = data.themesData.filter(function (themeObj) {
return themeObj.id === themeId;
})[0];
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
if (process.env.NODE_ENV === 'development') {
winston.info('[themes] Using theme ' + themeId);
}
if (!themeObj) {
return callback(new Error('[[error:theme-not-found]]'));
}
if (!themeObj) {
return callback(new Error('[[error:theme-not-found]]'));
}
Meta.themes.setPath(themeObj);
callback();
});
Meta.themes.setPath(themeObj);
next();
},
], callback);
};
Meta.themes.setPath = function (themeObj) {

Write Preview
Loading…
Cancel
Save