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

nmagedman · web-flow · commit f60a471c2414 · 2021-07-01T14:11:32.000-03:00
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);

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ export const insertMessage = function(user, message, rid, upsert = false) {`
`119`	`119`
`120`	`120`	`const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\(\)\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g);`
`121`	`121`	`if (urls) {`
`122`		`- message.urls = urls.map((url) => ({ url }));`
	`122`	`+ message.urls = [...new Set(urls)].map((url) => ({ url }));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`message = Markdown.mountTokensBack(message, false);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export const parseUrlsInMessage = (message) => {`
`10`	`10`
`11`	`11`	`const urls = message.html.match(/([A-Za-z]{3,9}):\/\/([-;:&=\+\$,\w]+@{1})?([-A-Za-z0-9\.]+)+:?(\d+)?((\/[-\+=!:~%\/\.@\,\w]*)?\??([-\+=&!:;%@\/\.\,\w]+)?(?:#([^\s\)]+))?)?/g) \|\| [];`
`12`	`12`	`if (urls) {`
`13`		`- message.urls = urls.map((url) => ({ url }));`
	`13`	`+ message.urls = [...new Set(urls)].map((url) => ({ url }));`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`message = Markdown.mountTokensBack(message, false);`