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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Aziz Khoury
2014-01-20 13:22:16 -05:00
parent f74f01ca77 2654a8e86a
commit ba85ffb292
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/translator.js
View File

@@ -39,6 +39,10 @@
languageCode = 'cz'; languageCode = 'cz';
break; break;
case 'zh_cn':
languageCode = 'zh-CN';
break;
default: default:
languageCode = config.defaultLang; languageCode = config.defaultLang;
break; break;

2
public/templates/admin/header.tpl
View File

@@ -37,7 +37,7 @@
<script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script> <script src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
<script src="{relative_path}/src/utils.js"></script> <script src="{relative_path}/src/utils.js"></script>
<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css" /> <link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css?{cache-buster}" />
</head> </head>
<body class="admin"> <body class="admin">

21
src/messaging.js
View File

@@ -49,8 +49,7 @@ var db = require('./database'),
return callback(null, []); return callback(null, []);
} }
user.getMultipleUserFields([fromuid, touid], ['username', 'picture'], function(err, userData) {
user.getUserField(touid, 'username', function(err, tousername) {
if(err) { if(err) {
return callback(err, null); return callback(err, null);
} }
@@ -63,7 +62,7 @@ var db = require('./database'),
return next(err); 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; message.content = result;
messages.push(message); messages.push(message);
next(null); 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) { plugins.fireHook('filter:post.parse', message, function(err, parsed) {
if (err) { if (err) {
return callback(message); return callback(message);
} }
var username; var username,
if (fromuid === myuid) { picture;
username = "<span class='chat-user chat-user-you'>You</span>: ";
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 { } 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);
}); });
}; };

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