From 71888adb099901d12e2a09d9e2a67745be8e266f Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 20 Jan 2014 12:56:09 -0500
Subject: [PATCH 1/3] closes #815, closes #816

---
 src/messaging.js         | 21 ++++++++++++---------
 src/socket.io/modules.js |  7 +++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/messaging.js b/src/messaging.js
index dce2ba6d0f..af3b8a1183 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -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);
 		});
 	};
 
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index b2bc6b0940..d59a18425b 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -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()
                         });
                     }

From f9e8178d25400df1b9c71d718120677e6bb2b9e9 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 20 Jan 2014 13:16:23 -0500
Subject: [PATCH 2/3] fixed timeagago for zh_cn

---
 public/src/translator.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/src/translator.js b/public/src/translator.js
index afc726d446..2cebc85fc7 100644
--- a/public/src/translator.js
+++ b/public/src/translator.js
@@ -39,6 +39,10 @@
 					languageCode = 'cz';
 					break;
 
+				case 'zh_cn':
+					languageCode = 'zh-CN';
+					break;
+
 				default:
 					languageCode = config.defaultLang;
 					break;

From 2654a8e86aa1e5594dabed8afac3b45ed8592b15 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 20 Jan 2014 13:22:03 -0500
Subject: [PATCH 3/3] added cache buster to ACP theme

---
 public/templates/admin/header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index ee3b7f2339..05159da6d0 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -37,7 +37,7 @@
 	<script src="//code.jquery.com/ui/1.10.3/jquery-ui.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>
 
 <body class="admin">