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

fix: add post queue to /compose POST route

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2019-04-18 08:00:55 -04:00
parent 4df925e76a
commit c6cd6c5705
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/admin/postqueue.js
View File

@@ -64,8 +64,10 @@ function getQueuedPosts(ids, callback) {
function (data, next) {
postData = data;
data.forEach(function (data) {
data.data = JSON.parse(data.data);
data.data.timestampISO = utils.toISOString(data.data.timestamp);
if (data) {
data.data = JSON.parse(data.data);
data.data.timestampISO = utils.toISOString(data.data.timestamp);
}
return data;
});
const uids = data.map(data => data && data.uid);
@@ -73,10 +75,15 @@ function getQueuedPosts(ids, callback) {
},
function (userData, next) {
postData.forEach(function (postData, index) {
postData.user = userData[index];
if (postData) {
postData.user = userData[index];
}
});
async.map(postData, function (postData, next) {
if (!postData) {
return next(null, postData);
}
postData.data.rawContent = validator.escape(String(postData.data.content));
postData.data.title = validator.escape(String(postData.data.title || ''));
async.waterfall([

24
src/controllers/composer.js
View File

@@ -6,6 +6,7 @@ var nconf = require('nconf');
var user = require('../user');
var plugins = require('../plugins');
var topics = require('../topics');
var posts = require('../posts');
var helpers = require('./helpers');
exports.get = function (req, res, callback) {
@@ -53,21 +54,38 @@ exports.post = function (req, res) {
async.waterfall([
function (next) {
function queueOrPost(postFn, data, next) {
async.waterfall([
function (next) {
posts.shouldQueue(req.uid, data, next);
},
function (shouldQueue, next) {
if (shouldQueue) {
delete data.req;
posts.addToQueue(data, next);
} else {
postFn(data, next);
}
},
], next);
}
if (body.tid) {
data.tid = body.tid;
topics.reply(data, next);
queueOrPost(topics.reply, data, next);
} else if (body.cid) {
data.cid = body.cid;
data.title = body.title;
data.tags = [];
data.thumb = '';
topics.post(data, next);
queueOrPost(topics.post, data, next);
} else {
next(new Error('[[error:invalid-data]]'));
}
},
function (result, next) {
if (result.queued) {
return res.redirect((nconf.get('relative_path') || '/'));
}
var uid = result.uid ? result.uid : result.topicData.uid;
user.updateOnlineUsers(uid);
next(null, result.pid ? '/post/' + result.pid : '/topic/' + result.topicData.slug);