From 139360ce1895726366aaa4e3f6d6c236f526ca7b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 14 Oct 2016 09:20:51 +0300
Subject: [PATCH] if chat is restricted dont allow adding to room

---
 src/socket.io/modules.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index f47ba0f5d7..b838623e7b 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -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);