Merge pull request #7538 from satyapramodh/url_parse

[FIX] URL parse error fix for issue #7169
RocketChat · Jul 26, 2017 · 5fade40 · 5fade40
2 parents d3c2b75 + 42cae84
commit 5fade40
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/rocketchat-lib/server/functions/sendMessage.js b/packages/rocketchat-lib/server/functions/sendMessage.js
@@ -19,7 +19,8 @@ RocketChat.sendMessage = function(user, message, room, upsert = false) {
 		}
 	}
 	if (message.parseUrls !== false) {
-		const urls = message.msg.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g);
+		const urls = message.msg.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\(\)\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g);
+
 		if (urls) {
 			message.urls = urls.map(function(url) {
 				return {