Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-23 00:40:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #815, closes #816

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-20 12:56:09 -05:00
parent e2960e3ed6
commit 71888adb09
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ SocketModules.chats.send = function(socket, data) {
var msg = S(data.message).stripTags().s;
user.getMultipleUserFields([socket.uid, touid], ['username'], function(err, usersData) {
user.getMultipleUserFields([socket.uid, touid], ['username', 'picture'], function(err, usersData) {
if(err) {
return;
}
@@ -109,7 +109,7 @@ SocketModules.chats.send = function(socket, data) {
});
});
}
Messaging.parse(msg, socket.uid, socket.uid, toUsername, function(parsed) {
Messaging.parse(msg, socket.uid, socket.uid, usersData[1], usersData[0], function(parsed) {
Messaging.addMessage(socket.uid, touid, msg, function(err, message) {
var numSockets = 0,
x;
@@ -121,8 +121,7 @@ SocketModules.chats.send = function(socket, data) {
server.userSockets[touid][x].emit('event:chats.receive', {
fromuid: socket.uid,
username: username,
// todo this isnt very nice, but can't think of a better way atm
message: parsed.replace("chat-user-you'>You", "'>" + username),
message: parsed,
timestamp: Date.now()
});
}