Merge pull request #8046 from RocketChat/prevent-autotranslate-race-c…

…ondition [FIX] Prevent autotranslate tokens race condition
RocketChat · Sep 5, 2017 · cc2a537 · cc2a537
2 parents 027b46c + 61a7915
commit cc2a537
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/packages/rocketchat-autotranslate/server/autotranslate.js b/packages/rocketchat-autotranslate/server/autotranslate.js
@@ -15,6 +15,9 @@ class AutoTranslate {
 	}
 
 	tokenize(message) {
+		if (!message.tokens || !Array.isArray(message.tokens)) {
+			message.tokens = [];
+		}
 		message = this.tokenizeEmojis(message);
 		message = this.tokenizeCode(message);
 		message = this.tokenizeURLs(message);
@@ -23,9 +26,6 @@ class AutoTranslate {
 	}
 
 	tokenizeEmojis(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 		message.msg = message.msg.replace(/:[+\w\d]+:/g, function(match) {
 			const token = `<i class=notranslate>{${ count++ }}</i>`;
@@ -40,9 +40,6 @@ class AutoTranslate {
 	}
 
 	tokenizeURLs(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		const schemes = RocketChat.settings.get('Markdown_SupportSchemesForLink').split(',').join('|');
@@ -85,9 +82,6 @@ class AutoTranslate {
 	}
 
 	tokenizeCode(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		message.html = message.msg;
@@ -109,9 +103,6 @@ class AutoTranslate {
 	}
 
 	tokenizeMentions(message) {
-		if (!message.tokens || !Array.isArray(message.tokens)) {
-			message.tokens = [];
-		}
 		let count = message.tokens.length;
 
 		if (message.mentions && message.mentions.length > 0) {