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

more fixes

Browse Source
This commit is contained in:
barisusakli
2015-12-15 20:00:51 +02:00
parent 43c697a5df
commit c5d2f61b01
3 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,11 @@ SocketModules.chats.getRaw = function(socket, data, callback) {
};
SocketModules.chats.send = function(socket, data, callback) {
if (!data) {
if (!data || !data.roomId) {
return callback(new Error('[[error:invalid-data]]'));
}
var now = Date.now(),
touid = parseInt(data.touid, 10);
var now = Date.now();
// Websocket rate limiting
socket.lastChatMessageTime = socket.lastChatMessageTime || 0;
@@ -55,17 +54,17 @@ SocketModules.chats.send = function(socket, data, callback) {
socket.lastChatMessageTime = now;
}
Messaging.canMessage(socket.uid, touid, function(err, allowed) {
Messaging.canMessage(socket.uid, data.roomId, function(err, allowed) {
if (err || !allowed) {
return callback(err || new Error('[[error:chat-restricted]]'));
}
Messaging.addMessage(socket.uid, touid, data.message, now, function(err, message) {
Messaging.sendMessage(socket.uid, data.roomId, data.message, now, function(err, message) {
if (err) {
return callback(err);
}
Messaging.notifyUser(socket.uid, touid, message);
Messaging.notifyUser(socket.uid, data.roomId, message);
callback();
});