Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 19:46:01 +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

21
src/messaging.js
View File

@@ -49,8 +49,7 @@ var db = require('./database'),
return callback(null, []);
}
user.getUserField(touid, 'username', function(err, tousername) {
user.getMultipleUserFields([fromuid, touid], ['username', 'picture'], function(err, userData) {
if(err) {
return callback(err, null);
}
@@ -63,7 +62,7 @@ var db = require('./database'),
return next(err);
}
Messaging.parse(message.content, message.fromuid, fromuid, tousername, function(result) {
Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], function(result) {
message.content = result;
messages.push(message);
next(null);
@@ -82,19 +81,23 @@ var db = require('./database'),
});
};
Messaging.parse = function (message, fromuid, myuid, tousername, callback) {
Messaging.parse = function (message, fromuid, myuid, toUserData, myUserData, callback) {
plugins.fireHook('filter:post.parse', message, function(err, parsed) {
if (err) {
return callback(message);
}
var username;
if (fromuid === myuid) {
username = "<span class='chat-user chat-user-you'>You</span>: ";
var username,
picture;
if (parseInt(fromuid, 10) === parseInt(myuid, 10)) {
picture = '<img class="chat-user-image" src="' + myUserData.picture + '">';
username = '<span class="chat-user chat-user-you"> '+ myUserData.username + '</span>: ';
} else {
username = "<span class='chat-user'>" + tousername + "</span>: ";
picture = '<img class="chat-user-image" src="' + toUserData.picture + '">';
username = '<span class="chat-user"> ' + toUserData.username + '</span>: ';
}
callback(username + parsed);
callback(picture + username + parsed);
});
};