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

if chat is restricted dont allow adding to room

Browse Source
This commit is contained in:
barisusakli
2016-10-14 09:20:51 +03:00
parent b32d7b86e8
commit 139360ce18
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/socket.io/modules.js
View File

@@ -140,6 +140,7 @@ SocketModules.chats.addUserToRoom = function (socket, data, callback) {
if (!data || !data.roomId || !data.username) {
return callback(new Error('[[error:invalid-data]]'));
}
var uid;
async.waterfall([
function (next) {
Messaging.getUserCountInRoom(data.roomId, next);
@@ -154,13 +155,25 @@ SocketModules.chats.addUserToRoom = function (socket, data, callback) {
function (next) {
user.getUidByUsername(data.username, next);
},
function (uid, next) {
function (_uid, next) {
uid = _uid;
if (!uid) {
return next(new Error('[[error:no-user]]'));
}
if (socket.uid === parseInt(uid, 10)) {
return next(new Error('[[error:cant-add-self-to-chat-room]]'));
}
async.parallel({
settings: async.apply(user.getSettings, uid),
isAdmin: async.apply(user.isAdministrator, socket.uid),
isFollowing: async.apply(user.isFollowing, uid, socket.uid)
}, next);
},
function (results, next) {
if (results.settings.restrictChat && !results.isAdmin && !results.isFollowing) {
return next(new Error('[[error:chat-restricted]]'));
}
Messaging.addUsersToRoom(socket.uid, [uid], data.roomId, next);
}
], callback);