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

closes #3997

Browse Source
This commit is contained in:
barisusakli
2015-12-24 09:52:25 +02:00
parent a43eef283c
commit 478faac945
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/chats.js
View File

@@ -65,6 +65,8 @@ chatsController.get = function(req, res, callback) {
room.nextStart = recentChats.nextStart; room.nextStart = recentChats.nextStart;
room.title = room.roomName; room.title = room.roomName;
room.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:chats]]', url: '/chats'}, {text: room.roomName}]); room.breadcrumbs = helpers.buildBreadcrumbs([{text: '[[pages:chats]]', url: '/chats'}, {text: room.roomName}]);
room.maximumUsersInChatRoom = parseInt(meta.config.maximumUsersInChatRoom, 10) || 0;
room.showUserInput = !room.maximumUsersInChatRoom || room.maximumUsersInChatRoom > 2;
res.render('chats', room); res.render('chats', room);
}); });

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

@@ -125,6 +125,8 @@ SocketModules.chats.loadRoom = function(socket, data, callback) {
function (results, next) { function (results, next) {
results.roomData.users = results.users; results.roomData.users = results.users;
results.roomData.isOwner = parseInt(results.roomData.owner, 10) === socket.uid; results.roomData.isOwner = parseInt(results.roomData.owner, 10) === socket.uid;
results.roomData.maximumUsersInChatRoom = parseInt(meta.config.maximumUsersInChatRoom, 10) || 0;
results.roomData.showUserInput = !results.roomData.maximumUsersInChatRoom || results.roomData.maximumUsersInChatRoom > 2;
next(null, results.roomData); next(null, results.roomData);
} }
], callback); ], callback);
@@ -135,6 +137,16 @@ SocketModules.chats.addUserToRoom = function(socket, data, callback) {
return callback(new Error('[[error:invalid-data]]')); return callback(new Error('[[error:invalid-data]]'));
} }
async.waterfall([ async.waterfall([
function (next) {
Messaging.getUserCountInRoom(data.roomId, next);
},
function (userCount, next) {
var maxUsers = parseInt(meta.config.maximumUsersInChatRoom, 10) || 0;
if (maxUsers && userCount >= maxUsers) {
return next(new Error('[[error:cant-add-more-users-to-chat-room]]'));
}
next();
},
function (next) { function (next) {
user.getUidByUsername(data.username, next); user.getUidByUsername(data.username, next);
}, },

5
src/views/admin/settings/chat.tpl
View File

@@ -20,6 +20,11 @@
<label>Maximum length of chat messages</label> <label>Maximum length of chat messages</label>
<input type="text" class="form-control" value="1000" data-field="maximumChatMessageLength"> <input type="text" class="form-control" value="1000" data-field="maximumChatMessageLength">
</div> </div>
<div class="form-group">
<label>Maximum number of users in chat rooms</label>
<input type="text" class="form-control" value="0" data-field="maximumUsersInChatRoom">
</div>
</div> </div>
</div> </div>