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

fix: #7809, dont check postDelay if submitting from queue

Browse Source
This commit is contained in:
Baris Usakli
2019-07-30 13:19:50 -04:00
parent 2abe244b6e
commit 9780f5b975
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/composer.js
View File

@@ -45,6 +45,7 @@ exports.post = function (req, res) {
req: req, req: req,
timestamp: Date.now(), timestamp: Date.now(),
content: body.content, content: body.content,
fromQueue: false,
}; };
req.body.noscript = 'true'; req.body.noscript = 'true';

1
src/posts/queue.js
View File

@@ -127,6 +127,7 @@ module.exports = function (Posts) {
return null; return null;
} }
data.data = JSON.parse(data.data); data.data = JSON.parse(data.data);
data.data.fromQueue = true;
return data; return data;
} }

7
src/socket.io/helpers.js
View File

@@ -18,6 +18,13 @@ var batch = require('../batch');
var SocketHelpers = module.exports; var SocketHelpers = module.exports;
SocketHelpers.setDefaultPostData = function (data, socket) {
data.uid = socket.uid;
data.req = websockets.reqFromSocket(socket);
data.timestamp = Date.now();
data.fromQueue = false;
};
SocketHelpers.notifyNew = function (uid, type, result) { SocketHelpers.notifyNew = function (uid, type, result) {
async.waterfall([ async.waterfall([
function (next) { function (next) {

5
src/socket.io/posts.js
View File

@@ -9,7 +9,6 @@ var meta = require('../meta');
var topics = require('../topics'); var topics = require('../topics');
const categories = require('../categories'); const categories = require('../categories');
var user = require('../user'); var user = require('../user');
var websockets = require('./index');
var socketHelpers = require('./helpers'); var socketHelpers = require('./helpers');
var utils = require('../utils'); var utils = require('../utils');
@@ -29,9 +28,7 @@ SocketPosts.reply = function (socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
data.uid = socket.uid; socketHelpers.setDefaultPostData(data, socket);
data.req = websockets.reqFromSocket(socket);
data.timestamp = Date.now();
async.waterfall([ async.waterfall([
function (next) { function (next) {

5
src/socket.io/topics.js
View File

@@ -4,7 +4,6 @@ var async = require('async');
var topics = require('../topics'); var topics = require('../topics');
var posts = require('../posts'); var posts = require('../posts');
var websockets = require('./index');
var user = require('../user'); var user = require('../user');
var meta = require('../meta'); var meta = require('../meta');
var apiController = require('../controllers/api'); var apiController = require('../controllers/api');
@@ -25,9 +24,7 @@ SocketTopics.post = function (socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
data.uid = socket.uid; socketHelpers.setDefaultPostData(data, socket);
data.req = websockets.reqFromSocket(socket);
data.timestamp = Date.now();
async.waterfall([ async.waterfall([
function (next) { function (next) {

4
src/topics/create.js
View File

@@ -88,7 +88,9 @@ module.exports = function (Topics) {
} }
await guestHandleValid(data); await guestHandleValid(data);
if (!data.fromQueue) {
await user.isReadyToPost(data.uid, data.cid); await user.isReadyToPost(data.uid, data.cid);
}
const filteredData = await plugins.fireHook('filter:topic.post', data); const filteredData = await plugins.fireHook('filter:topic.post', data);
data = filteredData; data = filteredData;
const tid = await Topics.create(data); const tid = await Topics.create(data);
@@ -159,7 +161,9 @@ module.exports = function (Topics) {
} }
await guestHandleValid(data); await guestHandleValid(data);
if (!data.fromQueue) {
await user.isReadyToPost(uid, data.cid); await user.isReadyToPost(uid, data.cid);
}
await plugins.fireHook('filter:topic.reply', data); await plugins.fireHook('filter:topic.reply', data);
if (data.content) { if (data.content) {
data.content = utils.rtrim(data.content); data.content = utils.rtrim(data.content);