Merge branch 'master' of https://github.com/designcreateplay/NodeBB

src/sitemap.js

@@ -20,11 +20,13 @@ var	path = require('path'),
 					var categoryUrls = [];
 					categories.getAllCategories(function(data) {
 						data.categories.forEach(function(category) {
-							categoryUrls.push({
-								url: path.join('category', category.slug),
-								changefreq: 'weekly',
-								priority: '0.4'
-							});
+							if (!category.disabled) {
+								categoryUrls.push({
+									url: path.join('category', category.slug),
+									changefreq: 'weekly',
+									priority: '0.4'
+								});
+							}
 						});
 
 						next(null, categoryUrls);
@@ -34,11 +36,13 @@ var	path = require('path'),
 					var	topicUrls = [];
 					topics.getAllTopics(null, null, function(topics) {
 						topics.forEach(function(topic) {
-							topicUrls.push({
-								url: path.join('topic', topic.slug),
-								changefreq: 'daily',
-								priority: '0.6'
-							});
+							if (topic.deleted !== '1') {
+								topicUrls.push({
+									url: path.join('topic', topic.slug),
+									changefreq: 'daily',
+									priority: '0.6'
+								});
+							}
 						});
 
 						next(null, topicUrls);

src/websockets.js

@@ -532,10 +532,11 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			socket.join('chat_' + uids[0] + '_' + uids[1]);
 
 			user.getUserField(uid, 'username', function(err, username) {
-				var finalMessage = 'New message from <strong>' + username + '</strong>';
+				var finalMessage = username + ': ' + msg,
+					notifText = 'New message from <strong>' + username + '</strong>';
 
 				if(!isUserOnline(touid)) {
-					notifications.create(finalMessage, 5, '#', 'notification_' + uid + '_' + touid, function(nid) {
+					notifications.create(notifText, 5, '#', 'notification_' + uid + '_' + touid, function(nid) {
 						notifications.push(nid, [touid], function(success) {
 
 						});