Merge pull request #6039 from RocketChat/improvements/report-abuse

Improve report abuse to pass the message id instead of message object

packages/rocketchat-ui/views/app/mobileMessageMenu.js

@@ -58,7 +58,7 @@ const mobileMessageMenu = {
 				return false;
 			}
 
-			Meteor.call('reportMessage', message, inputValue);
+			Meteor.call('reportMessage', message._id, inputValue);
 
 			swal({
 				title: TAPi18n.__('Report_sent'),

server/methods/reportMessage.js

 Meteor.methods({
-	reportMessage(message, description) {
-		check(message, Object);
+	reportMessage(messageId, description) {
+		check(messageId, String);
 		check(description, String);
 
 		if (!Meteor.userId()) {
@@ -15,6 +15,13 @@ Meteor.methods({
 			});
 		}
 
+		const message = RocketChat.models.Messages.findOneById(messageId);
+		if (!message) {
+			throw new Meteor.Error('error-invalid-message_id', 'Invalid message id', {
+				method: 'reportMessage'
+			});
+		}
+
 		return RocketChat.models.Reports.createWithMessageDescriptionAndUserId(message, description, Meteor.userId());
 	}
 });