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

closes #4123

Browse Source
This commit is contained in:
barisusakli
2016-02-01 21:09:35 +02:00
parent 3336365e53
commit 821461f802
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/messaging.js
View File

@@ -357,7 +357,7 @@ var async = require('async'),
Messaging.canMessageRoom = function(uid, roomId, callback) {
if (parseInt(meta.config.disableChat) === 1 || !uid) {
return callback(null, false, '[[error:chat-disabled]]');
return callback(new Error('[[error:chat-disabled]]'));
}
async.waterfall([
@@ -366,20 +366,20 @@ var async = require('async'),
},
function (inRoom, next) {
if (!inRoom) {
return callback(null, false, '[[error:not-in-room]]');
return next(new Error('[[error:not-in-room]]'));
}
user.getUserFields(uid, ['banned', 'email:confirmed'], next);
},
function (userData, next) {
if (parseInt(userData.banned, 10) === 1) {
return callback(null, false, '[[error:user-banned]]');
return next(new Error('[[error:user-banned]]'));
}
if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(null, false, '[[error:email-not-confirmed-chat]]');
return next(new Error('[[error:email-not-confirmed-chat]]'));
}
next(null, true);
next();
}
], callback);
};

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

@@ -85,21 +85,19 @@ SocketModules.chats.send = function(socket, data, callback) {
socket.lastChatMessageTime = now;
}
Messaging.canMessageRoom(socket.uid, data.roomId, function(err, allowed, notAllowedMessage) {
if (err || !allowed) {
return callback(err || new Error(notAllowedMessage));
}
Messaging.sendMessage(socket.uid, data.roomId, data.message, now, function(err, message) {
if (err) {
return callback(err);
}
async.waterfall([
function (next) {
Messaging.canMessageRoom(socket.uid, data.roomId, next);
},
function (next) {
Messaging.sendMessage(socket.uid, data.roomId, data.message, now, next);
},
function (message, next) {
Messaging.notifyUsersInRoom(socket.uid, data.roomId, message);
callback();
});
});
user.updateOnlineUsers(socket.uid);
next();
}
], callback);
};
SocketModules.chats.loadRoom = function(socket, data, callback) {
@@ -217,12 +215,7 @@ SocketModules.chats.delete = function(socket, data, callback) {
};
SocketModules.chats.canMessage = function(socket, roomId, callback) {
Messaging.canMessageRoom(socket.uid, roomId, function(err, allowed, notAllowedMessage) {
if (err || !allowed) {
return callback(err || new Error(notAllowedMessage));
}
callback();
});
Messaging.canMessageRoom(socket.uid, roomId, callback);
};
SocketModules.chats.markRead = function(socket, roomId, callback) {
@@ -235,18 +228,18 @@ SocketModules.chats.markRead = function(socket, roomId, callback) {
}
Messaging.pushUnreadCount(socket.uid);
// Mark notification read
var nids = results.usersInRoom.filter(function(uid) {
return parseInt(uid, 10) !== socket.uid;
}).map(function(uid) {
return 'chat_' + uid + '_' + roomId;
});
notifications.markReadMultiple(nids, socket.uid, function() {
user.notifications.pushCount(socket.uid);
});
callback();
});
};