Fix the generateEml throwing an error when the message type isn't defined and...

Fix the generateEml throwing an error when the message type isn't defined and fix a conflict of the saveSetting.coffee being added back in when it was removed

packages/rocketchat-lib/server/methods/saveSetting.coffee

-Meteor.methods
-	saveSetting: (_id, value) ->
-
-		check _id, String
-
-		if Meteor.userId()?
-			user = Meteor.users.findOne Meteor.userId()
-
-		unless RocketChat.authz.hasPermission(Meteor.userId(), 'edit-privileged-setting') is true
-			throw new Meteor.Error 'error-action-not-allowed', 'Editing settings is not allowed', { method: 'saveSetting' }
-
-		# console.log "saveSetting -> ".green, _id, value
-		RocketChat.settings.updateById _id, value
-		return true

packages/rocketchat-smarsh-connector/server/functions/generateEml.js

@@ -58,7 +58,12 @@ RocketChat.smarsh.generateEml = () => {
 				data.msgs++;
 				if (message.t) {
 					const messageType = RocketChat.MessageTypes.getType(message);
-					rows.push(TAPi18n.__(messageType.message, messageType.data(message), 'en'));
+					if (messageType) {
+						rows.push(TAPi18n.__(messageType.message, messageType.data(message), 'en'));
+					} else {
+						console.log(`The message type ${message.t} does not have a MessageType.`);
+						rows.push(message.msg);
+					}
 				} else if (message.file) {
 					data.files.push(message.file._id);
 					rows.push(`${message.attachments[0].title} (${_getLink(message.attachments[0])})`);