From 2abe244b6e9e19ad8beb0bcf108a9d6114a7c475 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 30 Jul 2019 13:03:01 -0400 Subject: [PATCH 1/3] fix: newPostEditDuration --- install/data/defaults.json | 2 +- test/posts.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/data/defaults.json b/install/data/defaults.json index bfdcd18f1d..3f32fce583 100644 --- a/install/data/defaults.json +++ b/install/data/defaults.json @@ -11,7 +11,7 @@ "initialPostDelay": 10, "newbiePostDelay": 120, "postEditDuration": 0, - "newbiePostEditDuration": 3600000, + "newbiePostEditDuration": 3600, "postDeleteDuration": 0, "enablePostHistory": 1, "postCacheSize": 10485760, diff --git a/test/posts.js b/test/posts.js index 09043e2650..0bfdf2b633 100644 --- a/test/posts.js +++ b/test/posts.js @@ -518,7 +518,7 @@ describe('Post\'s', function () { setTimeout(function () { socketPosts.edit({ uid: voterUid }, { pid: pid, content: 'edited post content again', title: 'edited title again', tags: ['edited-twice'] }, function (err, data) { assert.equal(err.message, '[[error:post-edit-duration-expired, 1]]'); - meta.config.newbiePostEditDuration = 3600000; + meta.config.newbiePostEditDuration = 3600; done(); }); }, 1000); From 9780f5b9755181da360792e51c08ee38de1132a1 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Tue, 30 Jul 2019 13:19:50 -0400 Subject: [PATCH 2/3] fix: #7809, dont check postDelay if submitting from queue --- src/controllers/composer.js | 1 + src/posts/queue.js | 1 + src/socket.io/helpers.js | 7 +++++++ src/socket.io/posts.js | 5 +---- src/socket.io/topics.js | 5 +---- src/topics/create.js | 8 ++++++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/controllers/composer.js b/src/controllers/composer.js index 356cae1f57..93263d2ed0 100644 --- a/src/controllers/composer.js +++ b/src/controllers/composer.js @@ -45,6 +45,7 @@ exports.post = function (req, res) { req: req, timestamp: Date.now(), content: body.content, + fromQueue: false, }; req.body.noscript = 'true'; diff --git a/src/posts/queue.js b/src/posts/queue.js index e811eaaa16..d861792b30 100644 --- a/src/posts/queue.js +++ b/src/posts/queue.js @@ -127,6 +127,7 @@ module.exports = function (Posts) { return null; } data.data = JSON.parse(data.data); + data.data.fromQueue = true; return data; } diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js index b808c73929..7fd30e750a 100644 --- a/src/socket.io/helpers.js +++ b/src/socket.io/helpers.js @@ -18,6 +18,13 @@ var batch = require('../batch'); 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) { async.waterfall([ function (next) { diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js index a67f99297a..19833df6b7 100644 --- a/src/socket.io/posts.js +++ b/src/socket.io/posts.js @@ -9,7 +9,6 @@ var meta = require('../meta'); var topics = require('../topics'); const categories = require('../categories'); var user = require('../user'); -var websockets = require('./index'); var socketHelpers = require('./helpers'); var utils = require('../utils'); @@ -29,9 +28,7 @@ SocketPosts.reply = function (socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - data.uid = socket.uid; - data.req = websockets.reqFromSocket(socket); - data.timestamp = Date.now(); + socketHelpers.setDefaultPostData(data, socket); async.waterfall([ function (next) { diff --git a/src/socket.io/topics.js b/src/socket.io/topics.js index 9bf60d00de..7c84109046 100644 --- a/src/socket.io/topics.js +++ b/src/socket.io/topics.js @@ -4,7 +4,6 @@ var async = require('async'); var topics = require('../topics'); var posts = require('../posts'); -var websockets = require('./index'); var user = require('../user'); var meta = require('../meta'); var apiController = require('../controllers/api'); @@ -25,9 +24,7 @@ SocketTopics.post = function (socket, data, callback) { return callback(new Error('[[error:invalid-data]]')); } - data.uid = socket.uid; - data.req = websockets.reqFromSocket(socket); - data.timestamp = Date.now(); + socketHelpers.setDefaultPostData(data, socket); async.waterfall([ function (next) { diff --git a/src/topics/create.js b/src/topics/create.js index 21ed17fe79..703b27703c 100644 --- a/src/topics/create.js +++ b/src/topics/create.js @@ -88,7 +88,9 @@ module.exports = function (Topics) { } await guestHandleValid(data); - await user.isReadyToPost(data.uid, data.cid); + if (!data.fromQueue) { + await user.isReadyToPost(data.uid, data.cid); + } const filteredData = await plugins.fireHook('filter:topic.post', data); data = filteredData; const tid = await Topics.create(data); @@ -159,7 +161,9 @@ module.exports = function (Topics) { } await guestHandleValid(data); - await user.isReadyToPost(uid, data.cid); + if (!data.fromQueue) { + await user.isReadyToPost(uid, data.cid); + } await plugins.fireHook('filter:topic.reply', data); if (data.content) { data.content = utils.rtrim(data.content); From 7ad72b324d02f1cd9c619245a4d4919a3bbb32bb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 29 Jul 2019 17:31:31 +0000 Subject: [PATCH 3/3] chore(deps): update dependency husky to v3.0.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 5509b167ef..d11e233e70 100644 --- a/install/package.json +++ b/install/package.json @@ -139,7 +139,7 @@ "eslint-plugin-import": "2.18.1", "grunt": "1.0.4", "grunt-contrib-watch": "1.1.0", - "husky": "3.0.1", + "husky": "3.0.2", "jsdom": "15.1.1", "lint-staged": "8.2.1", "mocha": "6.2.0",