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

refactor user/category data

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-10-20 17:07:32 -04:00
parent c3a903142a
commit f53984aeae
2 changed files with 83 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
src/categories/data.js
View File

@@ -6,74 +6,16 @@ var winston = require('winston');
var db = require('../database');
const intFields = ['cid', 'parentCid', 'disabled', 'isSection', 'order', 'topic_count', 'post_count'];
module.exports = function (Categories) {
Categories.getCategoryData = function (cid, callback) {
async.waterfall([
function (next) {
db.getObject('category:' + cid, next);
},
function (category, next) {
modifyCategory(category);
next(null, category);
},
], callback);
};
Categories.getCategoriesData = function (cids, callback) {
Categories.getCategoriesFields(cids, [], callback);
};
function modifyCategory(category) {
if (!category) {
return;
}
if (category.hasOwnProperty('name')) {
category.name = validator.escape(String(category.name || ''));
}
if (category.hasOwnProperty('disabled')) {
category.disabled = parseInt(category.disabled, 10) === 1;
}
if (category.hasOwnProperty('isSection')) {
category.isSection = parseInt(category.isSection, 10) === 1;
}
if (category.hasOwnProperty('icon')) {
category.icon = category.icon || 'hidden';
}
if (category.hasOwnProperty('post_count')) {
category.post_count = category.post_count || 0;
category.totalPostCount = category.post_count;
}
if (category.hasOwnProperty('topic_count')) {
category.topic_count = category.topic_count || 0;
category.totalTopicCount = category.topic_count;
}
if (category.image) {
category.backgroundImage = category.image;
}
if (category.description) {
category.description = validator.escape(String(category.description));
category.descriptionParsed = category.descriptionParsed || category.description;
}
}
Categories.getCategoryField = function (cid, field, callback) {
db.getObjectField('category:' + cid, field, callback);
};
Categories.getCategoriesFields = function (cids, fields, callback) {
if (!Array.isArray(cids) || !cids.length) {
return callback(null, []);
}
var keys = cids.map(function (cid) {
return 'category:' + cid;
});
var keys = cids.map(cid => 'category:' + cid);
async.waterfall([
function (next) {
if (fields.length) {
@@ -89,6 +31,28 @@ module.exports = function (Categories) {
], callback);
};
Categories.getCategoryData = function (cid, callback) {
Categories.getCategoriesFields([cid], [], function (err, categories) {
callback(err, categories && categories.length ? categories[0] : null);
});
};
Categories.getCategoriesData = function (cids, callback) {
Categories.getCategoriesFields(cids, [], callback);
};
Categories.getCategoryField = function (cid, field, callback) {
Categories.getCategoryFields(cid, [field], function (err, category) {
callback(err, category ? category[field] : null);
});
};
Categories.getCategoryFields = function (cid, fields, callback) {
Categories.getCategoriesFields([cid], fields, function (err, categories) {
callback(err, categories ? categories[0] : null);
});
};
Categories.getMultipleCategoryFields = function (cids, fields, callback) {
winston.warn('[deprecated] Categories.getMultipleCategoryFields is deprecated please use Categories.getCategoriesFields');
Categories.getCategoriesFields(cids, fields, callback);
@@ -103,10 +67,6 @@ module.exports = function (Categories) {
], callback);
};
Categories.getCategoryFields = function (cid, fields, callback) {
db.getObjectFields('category:' + cid, fields, callback);
};
Categories.setCategoryField = function (cid, field, value, callback) {
db.setObjectField('category:' + cid, field, value, callback);
};
@@ -115,3 +75,38 @@ module.exports = function (Categories) {
db.incrObjectFieldBy('category:' + cid, field, value, callback);
};
};
function modifyCategory(category) {
if (!category) {
return;
}
intFields.forEach(field => db.parseIntField(category, field));
if (category.hasOwnProperty('name')) {
category.name = validator.escape(String(category.name || ''));
}
if (category.hasOwnProperty('icon')) {
category.icon = category.icon || 'hidden';
}
if (category.hasOwnProperty('post_count')) {
category.post_count = category.post_count || 0;
category.totalPostCount = category.post_count;
}
if (category.hasOwnProperty('topic_count')) {
category.topic_count = category.topic_count || 0;
category.totalTopicCount = category.topic_count;
}
if (category.image) {
category.backgroundImage = category.image;
}
if (category.description) {
category.description = validator.escape(String(category.description));
category.descriptionParsed = category.descriptionParsed || category.description;
}
}