Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-05 23:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2209

Browse Source
This commit is contained in:
barisusakli
2014-10-03 15:28:46 -04:00
parent f5f84d9946
commit c37cfe4b3f
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,27 +192,37 @@ SocketModules.chats.send = function(socket, data, callback) {
var msg = S(data.message).stripTags().s;
Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
user.getUserField(socket.uid, 'banned', function(err, banned) {
if (err) {
return callback(err);
}
Messaging.notifyUser(socket.uid, touid, message);
if (parseInt(banned, 10) === 1) {
return callback(new Error('[[error:user-banned]]'));
}
// Recipient
SocketModules.chats.pushUnreadCount(touid);
server.in('uid_' + touid).emit('event:chats.receive', {
withUid: socket.uid,
message: message,
self: 0
});
Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
if (err) {
return callback(err);
}
// Sender
SocketModules.chats.pushUnreadCount(socket.uid);
server.in('uid_' + socket.uid).emit('event:chats.receive', {
withUid: touid,
message: message,
self: 1
Messaging.notifyUser(socket.uid, touid, message);
// Recipient
SocketModules.chats.pushUnreadCount(touid);
server.in('uid_' + touid).emit('event:chats.receive', {
withUid: socket.uid,
message: message,
self: 0
});
// Sender
SocketModules.chats.pushUnreadCount(socket.uid);
server.in('uid_' + socket.uid).emit('event:chats.receive', {
withUid: touid,
message: message,
self: 1
});
});
});
};

3
src/user.js
View File

@@ -111,6 +111,7 @@ var async = require('async'),
user.uid = 0;
user.username = '[[global:guest]]';
user.userslug = '';
user.picture = User.createGravatarURLFromEmail('');
}
if (user.picture) {
@@ -119,8 +120,6 @@ var async = require('async'),
} else {
user.picture = User.createGravatarURLFromEmail(user.email);
}
} else {
user.picture = User.createGravatarURLFromEmail('');
}
for(var i=0; i<fieldsToRemove.length; ++i) {