Fix AutoLinker issues

.meteor/versions

@@ -63,7 +63,6 @@ [email protected]
 kadira:[email protected]
 kadira:[email protected]
 kenton:[email protected]
-konecty:[email protected]
 konecty:[email protected]
 konecty:[email protected]
 konecty:[email protected]

packages/rocketchat-autolinker/autolinker.coffee

@@ -6,21 +6,32 @@
 class AutoLinker
 	constructor: (message) ->
 		if _.trim message.html
+			regUrls = new RegExp(RocketChat.settings.get 'AutoLinker_UrlsRegExp')
+
+			autolinker = new Autolinker
+				stripPrefix: RocketChat.settings.get 'AutoLinker_StripPrefix'
+				urls: RocketChat.settings.get 'AutoLinker_Urls'
+				email: RocketChat.settings.get 'AutoLinker_Email'
+				phone: RocketChat.settings.get 'AutoLinker_Phone'
+				twitter: false
+				replaceFn: (autolinker, match) ->
+					if match.getType() is 'url'
+						return regUrls.test match.matchedText
+					return null
+
+			regNonAutoLink = /(```\w*[\n ]?[\s\S]*?```+?)|(`(?:[^`]+)`)/
+			if RocketChat.settings.get 'Katex_Enabled'
+				regNonAutoLink = /(```\w*[\n ]?[\s\S]*?```+?)|(`(?:[^`]+)`)|(\\\(\w*[\n ]?[\s\S]*?\\\)+?)/
+
 			# Separate text in code blocks and non code blocks
-			msgParts = message.html.split /(```\w*[\n ]?[\s\S]*?```+?)|(`(?:[^`]+)`)/
+			msgParts = message.html.split regNonAutoLink
 
 			for part, index in msgParts
 				if part?.length? > 0
 					# Verify if this part is code
-					codeMatch = part.match /(?:```(\w*)[\n ]?([\s\S]*?)```+?)|(?:`(?:[^`]+)`)/
+					codeMatch = part.match regNonAutoLink
 					if not codeMatch?
-						msgParts[index] = Autolinker.link part,
-							stripPrefix: false
-							twitter: false
-							replaceFn: (autolinker, match) ->
-								if match.getType() is 'url'
-									return /(:\/\/|www\.).+/.test match.matchedText
-								return true
+						msgParts[index] = autolinker.link part
 
 			# Re-mount message
 			message.html = msgParts.join('')

packages/rocketchat-autolinker/package.js

@@ -10,9 +10,13 @@ Package.onUse(function(api) {
 
 	api.use([
 		'coffeescript',
-		'konecty:autolinker',
 		'rocketchat:lib'
 	]);
 
-	api.addFiles('autolinker.coffee', ['server','client']);
+	api.addFiles([
+		'autolinker.coffee',
+		'lib/Autolinker.min.js',
+	], ['client']);
+
+	api.addFiles('settings.coffee', ['server']);
 });

packages/rocketchat-autolinker/settings.coffee

@@ -0,0 +1,6 @@
+Meteor.startup ->
+	RocketChat.settings.add 'AutoLinker_StripPrefix', false, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_StripPrefix_Description'}
+	RocketChat.settings.add 'AutoLinker_Urls', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true}
+	RocketChat.settings.add 'AutoLinker_UrlsRegExp', '(://|www\\.).+', {type: 'string', group: 'Message', section: 'AutoLinker', public: true}
+	RocketChat.settings.add 'AutoLinker_Email', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true}
+	RocketChat.settings.add 'AutoLinker_Phone', true, {type: 'boolean', group: 'Message', section: 'AutoLinker', public: true, i18nDescription: 'AutoLinker_Phone_Description'}

packages/rocketchat-lib/i18n/en.i18n.json

@@ -141,6 +141,13 @@
   "Are_you_sure_you_want_to_delete_your_account" : "Are you sure you want to delete your account?",
   "Authorization_URL" : "Authorization URL",
   "Authorize" : "Authorize",
+  "AutoLinker_StripPrefix": "AutoLinker Strip Prefix",
+  "AutoLinker_StripPrefix_Description": "Short display. e.g. https://rocket.chat => rocket.chat",
+  "AutoLinker_Urls": "AutoLinker URL",
+  "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
+  "AutoLinker_Email": "AutoLinker Email",
+  "AutoLinker_Phone": "AutoLinker Phone",
+  "AutoLinker_Phone_Description": "Automatically linked for Phone numbers. e.g. `(123)456-7890`",
   "Auto_Load_Images" : "Auto Load Images",
   "Available_agents" : "Available agents",
   "Avatar" : "Avatar",

packages/rocketchat-lib/i18n/ja.i18n.json

@@ -140,6 +140,13 @@
   "Are_you_sure_you_want_to_delete_your_account" : "本当にアカウントを削除しますか?",
   "Authorization_URL" : "認証 URL",
   "Authorize" : "承認",
+  "AutoLinker_StripPrefix": "AutoLinker 先頭部分を表示しない",
+  "AutoLinker_StripPrefix_Description": "短い表示。例: https://rocket.chat => rocket.chat",
+  "AutoLinker_Urls": "AutoLinker URL",
+  "AutoLinker_UrlsRegExp": "AutoLinker URL 正規表現",
+  "AutoLinker_Email": "AutoLinker Email",
+  "AutoLinker_Phone": "AutoLinker 電話番号",
+  "AutoLinker_Phone_Description": "電話番号をリンクにする。例: `(123)456-7890`",
   "Auto_Load_Images" : "画像自動読み込み",
   "Available_agents" : "割り当てられる担当者",
   "Avatar" : "アバター",
@@ -1013,4 +1020,4 @@
   "Your_Open_Source_solution" : "独自のオープンソースチャットソリューション",
   "Your_password_is_wrong" : "パスワードが間違っています!",
   "Your_push_was_sent_to_s_devices" : "プッシュ通知が %s 台のデバイスへ送信されました"
-}
+}