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

fix: #9395, pass all data from client to Topics.reply (#9396)

Browse Source 
* fix: #9395, pass all data from client to Topics.reply

so plugins can set custom fields
refactor and use setDefaultPostData

* fix: circular json error

* refactor: change params
This commit is contained in:
Barış Soner Uşaklı
2021-03-15 15:34:05 -04:00
committed by GitHub
parent 33fbfdfe40
commit a8f7b24452
5 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/helpers.js
View File

@@ -10,6 +10,13 @@ const socketHelpers = require('../socket.io/helpers');
const websockets = require('../socket.io'); const websockets = require('../socket.io');
const events = require('../events'); const events = require('../events');
exports.setDefaultPostData = function (reqOrSocket, data) {
data.uid = reqOrSocket.uid;
data.req = exports.buildReqObject(reqOrSocket, { ...data });
data.timestamp = Date.now();
data.fromQueue = false;
};
// creates a slimmed down version of the request object // creates a slimmed down version of the request object
exports.buildReqObject = (req, payload) => { exports.buildReqObject = (req, payload) => {
req = req || {}; req = req || {};

20
src/api/topics.js
View File

@@ -34,10 +34,7 @@ topicsAPI.create = async function (caller, data) {
const payload = { ...data }; const payload = { ...data };
payload.tags = payload.tags || []; payload.tags = payload.tags || [];
payload.uid = caller.uid; apiHelpers.setDefaultPostData(caller, payload);
payload.req = apiHelpers.buildReqObject(caller);
payload.timestamp = Date.now();
payload.fromQueue = false;
// Blacklist & Post Queue // Blacklist & Post Queue
await meta.blacklist.test(caller.ip); await meta.blacklist.test(caller.ip);
@@ -58,19 +55,8 @@ topicsAPI.create = async function (caller, data) {
}; };
topicsAPI.reply = async function (caller, data) { topicsAPI.reply = async function (caller, data) {
const payload = { const payload = { ...data };
tid: data.tid, apiHelpers.setDefaultPostData(caller, payload);
uid: caller.uid,
req: apiHelpers.buildReqObject(caller), // For IP recording
content: data.content,
timestamp: Date.now(),
fromQueue: false,
};
if (data.toPid) { payload.toPid = data.toPid; }
if (data.handle && !parseInt(caller.uid, 10)) {
payload.handle = data.handle;
}
// Blacklist & Post Queue // Blacklist & Post Queue
await meta.blacklist.test(caller.ip); await meta.blacklist.test(caller.ip);

2
src/posts/create.js
View File

@@ -24,7 +24,7 @@ module.exports = function (Posts) {
throw new Error('[[error:invalid-uid]]'); throw new Error('[[error:invalid-uid]]');
} }
if (data.toPid && !utils.isNumber(data.toPid)) { if (data.hasOwnProperty('toPid') && !utils.isNumber(data.toPid)) {
throw new Error('[[error:invalid-pid]]'); throw new Error('[[error:invalid-pid]]');
} }

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

@@ -18,10 +18,8 @@ const apiHelpers = require('../api/helpers');
const SocketHelpers = module.exports; const SocketHelpers = module.exports;
SocketHelpers.setDefaultPostData = function (data, socket) { SocketHelpers.setDefaultPostData = function (data, socket) {
data.uid = socket.uid; websockets.warnDeprecated(socket, 'apiHelpers.setDefaultPostData');
data.req = apiHelpers.buildReqObject(socket); apiHelpers.setDefaultPostData(socket, data);
data.timestamp = Date.now();
data.fromQueue = false;
}; };
SocketHelpers.notifyNew = async function (uid, type, result) { SocketHelpers.notifyNew = async function (uid, type, result) {

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

@@ -10,6 +10,7 @@ const user = require('../user');
const socketHelpers = require('./helpers'); const socketHelpers = require('./helpers');
const utils = require('../utils'); const utils = require('../utils');
const api = require('../api'); const api = require('../api');
const apiHelpers = require('../api/helpers');
const sockets = require('.'); const sockets = require('.');
@@ -29,7 +30,7 @@ SocketPosts.reply = async function (socket, data) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }
socketHelpers.setDefaultPostData(data, socket); apiHelpers.setDefaultPostData(socket, data);
await meta.blacklist.test(data.req.ip); await meta.blacklist.test(data.req.ip);
const shouldQueue = await posts.shouldQueue(socket.uid, data); const shouldQueue = await posts.shouldQueue(socket.uid, data);
if (shouldQueue) { if (shouldQueue) {