Node.js based forum software built for the modern web
refactor: set ip on defaultPostData from req
Barış Soner Uşaklı26df22dc4520
diff --git a/src/api/helpers.js b/src/api/helpers.jsindex b4ed954387..01f79d9b0a 100644--- a/src/api/helpers.js+++ b/src/api/helpers.js@@ -11,9 +11,10 @@ const socketHelpers = require('../socket.io/helpers');const websockets = require('../socket.io');const events = require('../events');-exports.setDefaultPostData = function (reqOrSocket, data) {- data.uid = reqOrSocket.uid;- data.req = exports.buildReqObject(reqOrSocket, { ...data });+exports.setDefaultPostData = function (req, data) {+ data.uid = req.uid;+ data.req = exports.buildReqObject(req, { ...data });+ data.ip = req.ip;data.timestamp = Date.now();data.fromQueue = false;};diff --git a/src/posts/queue.js b/src/posts/queue.jsindex eadec34518..d4cb450a89 100644--- a/src/posts/queue.js+++ b/src/posts/queue.js@@ -31,10 +31,11 @@ module.exports = function (Posts) {postData.forEach((data) => {if (data) {data.data = JSON.parse(data.data);- if (data?.data?.req) {+ data.data.timestampISO = utils.toISOString(data.data.timestamp);+ if (data?.data) {delete data.data.req;+ delete data.data.ip;}- data.data.timestampISO = utils.toISOString(data.data.timestamp);}});const uids = postData.map(data => data && data.uid);diff --git a/src/topics/create.js b/src/topics/create.jsindex 28592e179e..598dfc8994 100644--- a/src/topics/create.js+++ b/src/topics/create.js@@ -146,7 +146,6 @@ module.exports = function (Topics) {let postData = data;postData.tid = tid;- postData.ip = data.req ? data.req.ip : null;postData.isMain = true;postData = await posts.create(postData);postData = await onNewPost(postData, data);@@ -228,7 +227,6 @@ module.exports = function (Topics) {data.timestamp = topicData.lastposttime + 1;}- data.ip = data.req ? data.req.ip : null;let postData = await posts.create(data);postData = await onNewPost(postData, data);