Merge remote-tracking branch 'origin/master' into develop

src/flags.js

@@ -4,6 +4,7 @@ var async = require('async');
 var _ = require('lodash');
 var S = require('string');
 var winston = require('winston');
+var validator = require('validator');
 
 var db = require('./database');
 var user = require('./user');
@@ -92,6 +93,7 @@ Flags.get = function (flagId, callback) {
 			}, function (err, payload) {
 				// Final object return construction
 				next(err, Object.assign(data.base, {
+					description: validator.escape(data.base.description),
 					datetimeISO: new Date(parseInt(data.base.datetime, 10)).toISOString(),
 					target_readable: data.base.type.charAt(0).toUpperCase() + data.base.type.slice(1) + ' ' + data.base.targetId,
 					target: payload.targetObj,
@@ -200,6 +202,7 @@ Flags.list = function (filters, uid, callback) {
 					}
 
 					next(null, Object.assign(flagObj, {
+						description: validator.escape(flagObj.description),
 						target_readable: flagObj.type.charAt(0).toUpperCase() + flagObj.type.slice(1) + ' ' + flagObj.targetId,
 						datetimeISO: new Date(parseInt(flagObj.datetime, 10)).toISOString(),
 					}));

src/messaging.js

@@ -153,6 +153,7 @@ Messaging.getRecentChats = function (callerUid, uid, start, stop, callback) {
 		},
 		function (results, next) {
 			results.roomData.forEach(function (room, index) {
+				if (room) {
 					room.users = results.users[index];
 					room.groupChat = room.hasOwnProperty('groupChat') ? room.groupChat : room.users.length > 2;
 					room.unread = results.unread[index];
@@ -169,8 +170,11 @@ Messaging.getRecentChats = function (callerUid, uid, start, stop, callback) {
 					room.lastUser = room.users[0];
 
 					room.usernames = Messaging.generateUsernames(room.users, uid);
+				}
 			});
 
+			results.roomData = results.roomData.filter(Boolean);
+
 			next(null, { rooms: results.roomData, nextStart: stop + 1 });
 		},
 		function (ref, next) {

src/plugins/hooks.js

@@ -40,13 +40,6 @@ module.exports = function (Plugins) {
 					'please use `' + Plugins.deprecatedHooks[data.hook] + '` instead.' :
 					'there is no alternative.'
 				));
-		} else {
-			// handle hook's startsWith, i.e. action:homepage.get
-			var parts = data.hook.split(':');
-			if (parts.length > 2) {
-				parts.pop();
-			}
-			parts.join(':');
 		}
 
 		if (data.hook && data.method) {