Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup, dont send ip on newpost

Browse Source
This commit is contained in:
barisusakli
2016-03-24 20:55:10 +02:00
parent 0823cd9433
commit 52cec92df8
3 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,11 @@ var plugins = require('../plugins');
var SocketHelpers = {}; var SocketHelpers = {};
SocketHelpers.notifyOnlineUsers = function(uid, result) { SocketHelpers.notifyOnlineUsers = function(uid, result) {
winston.warn('[deprecated] SocketHelpers.notifyOnlineUsers, consider using socketHelpers.notifyNew(uid, \'newPost\', result);');
SocketHelpers.notifyNew(uid, 'newPost', result);
};
SocketHelpers.notifyNew = function(uid, type, result) {
async.waterfall([ async.waterfall([
function(next) { function(next) {
user.getUidsFromSet('users:online', 0, -1, next); user.getUidsFromSet('users:online', 0, -1, next);
@@ -24,20 +29,23 @@ SocketHelpers.notifyOnlineUsers = function(uid, result) {
privileges.topics.filterUids('read', result.posts[0].topic.tid, uids, next); privileges.topics.filterUids('read', result.posts[0].topic.tid, uids, next);
}, },
function(uids, next) { function(uids, next) {
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: 'newPost'}, next); plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: uid, type: type}, next);
} }
], function(err, data) { ], function(err, data) {
if (err) { if (err) {
return winston.error(err.stack); return winston.error(err.stack);
} }
var uids = data.uidsTo; result.posts[0].ip = undefined;
for(var i=0; i<uids.length; ++i) { data.uidsTo.forEach(function(toUid) {
if (parseInt(uids[i], 10) !== uid) { if (parseInt(toUid, 10) !== uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', result); websockets.in('uid_' + toUid).emit('event:new_post', result);
if (result.topic && type === 'newTopic') {
websockets.in('uid_' + toUid).emit('event:new_topic', result.topic);
}
} }
} });
}); });
}; };

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

@@ -51,7 +51,7 @@ SocketPosts.reply = function(socket, data, callback) {
user.updateOnlineUsers(socket.uid); user.updateOnlineUsers(socket.uid);
socketHelpers.notifyOnlineUsers(socket.uid, result); socketHelpers.notifyNew(socket.uid, 'newPost', result);
if (data.lock) { if (data.lock) {
socketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [postData.topic.tid], cid: postData.topic.cid}); socketTopics.doTopicAction('lock', 'event:topic_locked', socket, {tids: [postData.topic.tid], cid: postData.topic.cid});

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

@@ -2,14 +2,12 @@
'use strict'; 'use strict';
var async = require('async'); var async = require('async');
var winston = require('winston');
var topics = require('../topics'); var topics = require('../topics');
var privileges = require('../privileges');
var plugins = require('../plugins');
var websockets = require('./index'); var websockets = require('./index');
var user = require('../user'); var user = require('../user');
var apiController = require('../controllers/api'); var apiController = require('../controllers/api');
var socketHelpers = require('./helpers');
var SocketTopics = {}; var SocketTopics = {};
@@ -43,33 +41,11 @@ SocketTopics.post = function(socket, data, callback) {
} }
callback(null, result.topicData); callback(null, result.topicData);
socket.emit('event:new_post', {posts: [result.postData]}); socket.emit('event:new_post', {posts: [result.postData]});
socket.emit('event:new_topic', result.topicData); socket.emit('event:new_topic', result.topicData);
async.waterfall([ socketHelpers.notifyNew(socket.uid, 'newTopic', {posts: [result.postData], topic: result.topicData});
function(next) {
user.getUidsFromSet('users:online', 0, -1, next);
},
function(uids, next) {
privileges.categories.filterUids('read', result.topicData.cid, uids, next);
},
function(uids, next) {
plugins.fireHook('filter:sockets.sendNewPostToUids', {uidsTo: uids, uidFrom: data.uid, type: 'newTopic'}, next);
}
], function(err, data) {
if (err) {
return winston.error(err.stack);
}
var uids = data.uidsTo;
for(var i=0; i<uids.length; ++i) {
if (parseInt(uids[i], 10) !== socket.uid) {
websockets.in('uid_' + uids[i]).emit('event:new_post', {posts: [result.postData]});
websockets.in('uid_' + uids[i]).emit('event:new_topic', result.topicData);
}
}
});
}); });
}; };