[IMPROVE] Preview message URLs only once (#22516)

RocketChat · Jul 1, 2021 · f60a471 · f60a471
1 parent aa7ee7b
commit f60a471
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js
@@ -119,7 +119,7 @@ export const insertMessage = function(user, message, rid, upsert = false) {
 
 		const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\(\)\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g);
 		if (urls) {
-			message.urls = urls.map((url) => ({ url }));
+			message.urls = [...new Set(urls)].map((url) => ({ url }));
 		}
 
 		message = Markdown.mountTokensBack(message, false);

diff --git a/app/lib/server/functions/parseUrlsInMessage.js b/app/lib/server/functions/parseUrlsInMessage.js
@@ -10,7 +10,7 @@ export const parseUrlsInMessage = (message) => {
 
 	const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g) || [];
 	if (urls) {
-		message.urls = urls.map((url) => ({ url }));
+		message.urls = [...new Set(urls)].map((url) => ({ url }));
 	}
 
 	message = Markdown.mountTokensBack(message, false);