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

closes #6850

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2018-10-20 16:31:16 -04:00
parent b2b33ffa57
commit c3a903142a
3 changed files with 46 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/database.js
View File

@@ -11,4 +11,10 @@ if (!databaseName) {
var primaryDB = require('./database/' + databaseName);
primaryDB.parseIntField = function (data, field) {
if (data.hasOwnProperty(field)) {
data[field] = parseInt(data[field], 10);
}
};
module.exports = primaryDB;

110
src/posts/data.js
View File

@@ -5,98 +5,58 @@ var async = require('async');
var db = require('../database');
var plugins = require('../plugins');
const intFields = ['uid', 'pid', 'tid', 'deleted'];
module.exports = function (Posts) {
Posts.getPostData = function (pid, callback) {
async.waterfall([
function (next) {
db.getObject('post:' + pid, next);
},
function (data, next) {
plugins.fireHook('filter:post.getPostData', { post: data }, next);
},
function (data, next) {
next(null, data.post);
},
], callback);
};
Posts.getPostsData = function (pids, callback) {
async.waterfall([
function (next) {
db.getObjects(pids.map(pid => 'post:' + pid), next);
},
function (data, next) {
plugins.fireHook('filter:post.getPostsData', { posts: data }, next);
},
function (data, next) {
next(null, data.posts);
},
], callback);
};
Posts.getPostField = function (pid, field, callback) {
async.waterfall([
function (next) {
Posts.getPostFields(pid, [field], next);
},
function (data, next) {
next(null, data[field]);
},
], callback);
};
Posts.getPostFields = function (pid, fields, callback) {
async.waterfall([
function (next) {
db.getObjectFields('post:' + pid, fields, next);
},
function (data, next) {
data.pid = pid;
plugins.fireHook('filter:post.getFields', { posts: [data], fields: fields }, next);
},
function (data, next) {
next(null, (data && Array.isArray(data.posts) && data.posts.length) ? data.posts[0] : null);
},
], callback);
};
Posts.getPostsFields = function (pids, fields, callback) {
if (!Array.isArray(pids) || !pids.length) {
return callback(null, []);
}
var keys = pids.map(function (pid) {
return 'post:' + pid;
});
var keys = pids.map(pid => 'post:' + pid);
async.waterfall([
function (next) {
if (fields.length) {
db.getObjectsFields(keys, fields, next);
} else {
db.getObjects(keys, next);
}
},
function (posts, next) {
plugins.fireHook('filter:post.getFields', { posts: posts, fields: fields }, next);
},
function (data, next) {
next(null, (data && Array.isArray(data.posts)) ? data.posts : null);
data.posts.forEach(modifyPost);
next(null, Array.isArray(data.posts) ? data.posts : null);
},
], callback);
};
Posts.setPostField = function (pid, field, value, callback) {
async.waterfall([
function (next) {
db.setObjectField('post:' + pid, field, value, next);
},
function (next) {
var data = {
pid: pid,
Posts.getPostData = function (pid, callback) {
Posts.getPostsFields([pid], [], function (err, posts) {
callback(err, posts && posts.length ? posts[0] : null);
});
};
data[field] = value;
plugins.fireHook('action:post.setFields', { data: data });
next();
},
], callback);
Posts.getPostsData = function (pids, callback) {
Posts.getPostsFields(pids, [], callback);
};
Posts.getPostField = function (pid, field, callback) {
Posts.getPostFields(pid, [field], function (err, post) {
callback(err, post ? post[field] : null);
});
};
Posts.getPostFields = function (pid, fields, callback) {
Posts.getPostsFields([pid], fields, function (err, posts) {
callback(err, posts ? posts[0] : null);
});
};
Posts.setPostField = function (pid, field, value, callback) {
Posts.setPostFields(pid, { [field]: value }, callback);
};
Posts.setPostFields = function (pid, data, callback) {
@@ -112,3 +72,9 @@ module.exports = function (Posts) {
], callback);
};
};
function modifyPost(post) {
if (post) {
intFields.forEach(field => db.parseIntField(post, field));
}
}

8
src/topics/data.js
View File

@@ -98,7 +98,7 @@ function modifyTopic(topic) {
return;
}
intFields.forEach(field => parseIntField(topic, field));
intFields.forEach(field => db.parseIntField(topic, field));
if (topic.hasOwnProperty('title')) {
topic.titleRaw = topic.title;
@@ -124,9 +124,3 @@ function modifyTopic(topic) {
topic.votes = topic.upvotes - topic.downvotes;
}
}
function parseIntField(topic, field) {
if (topic.hasOwnProperty(field)) {
topic[field] = parseInt(topic[field], 10);
}
}