Merge pull request #6704 from RocketChat/fix-message-types

[FIX] Fix message types

packages/rocketchat-channel-settings/client/startup/messageTypes.js

@@ -1,16 +1,49 @@
-function data(message) {
-	return {
-		user_by: message.u && message.u.username,
-		room_type: message.msg
-	};
-}
 Meteor.startup(function() {
-	['room_changed_privacy', 'room_changed_topic', 'room_changed_announcement', 'room_changed_description'].forEach(id => {
-		RocketChat.MessageTypes.registerType({
-			id,
-			system: true,
-			message: id,
-			data
-		});
+	RocketChat.MessageTypes.registerType({
+		id: 'room_changed_privacy',
+		system: true,
+		message: 'room_changed_privacy',
+		data(message) {
+			return {
+				user_by: message.u && message.u.username,
+				room_type: message.msg
+			};
+		}
+	});
+
+	RocketChat.MessageTypes.registerType({
+		id: 'room_changed_topic',
+		system: true,
+		message: 'room_changed_topic',
+		data(message) {
+			return {
+				user_by: message.u && message.u.username,
+				room_topic: message.msg
+			};
+		}
+	});
+
+	RocketChat.MessageTypes.registerType({
+		id: 'room_changed_announcement',
+		system: true,
+		message: 'room_changed_announcement',
+		data(message) {
+			return {
+				user_by: message.u && message.u.username,
+				room_announcement: message.msg
+			};
+		}
+	});
+
+	RocketChat.MessageTypes.registerType({
+		id: 'room_changed_description',
+		system: true,
+		message: 'room_changed_description',
+		data(message) {
+			return {
+				user_by: message.u && message.u.username,
+				room_description: message.msg
+			};
+		}
 	});
 });