Merging master as it was 1 commit ahead

musiqpad · Jun 27, 2016 · 159c257 · 159c257
2 parents c11998f + 5e0bfb2
commit 159c257
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/socketserver/socketserver.js b/socketserver/socketserver.js
@@ -667,7 +667,7 @@ var SocketServer = function(server){
 						roles: Roles.makeClientObj(),
 						roleOrder: Roles.getOrder(),
 						staffRoles: Roles.getStaffRoles(),
-						lastChat: that.room.makePrevChatObj(),
+						lastChat: ((!socket.user && !config.room.guestCanSeeChat) || (that.room.isUserRestricted((socket.user || {}).uid, 'BAN') && !config.room.bannedCanSeeChat)) ? [] : that.room.makePrevChatObj(),
 						time: new Date().getTime(),
 						captchakey: config.apis.reCaptcha.key,
 						allowemojis: config.room.allowemojis,