Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge: fix conflicts

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-03-15 15:34:05 -04:00
committed by Barış Soner Uşaklı
parent be01951c41
commit 44d9ac2a95
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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