TeamPiped-mirror/Piped
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped.git synced 2024-08-14 23:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use linkifyjs to add hyperlinks.

Browse source 
Closes #2770
Closes #2634
This commit is contained in:
Kavin 2023-08-05 17:32:32 +01:00
parent a861a8b95d
commit 70277fe077
No known key found for this signature in database
GPG key ID: 6E4598CA5C92C41F
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -18,6 +18,8 @@
"dompurify": "3.0.5",
"hotkeys-js": "3.12.0",
"javascript-time-ago": "2.5.9",
"linkify-html": "4.1.1",
"linkifyjs": "4.1.1",
"mux.js": "6.3.0",
"qrcode": "^1.5.3",
"shaka-player": "4.3.8",

18
pnpm-lock.yaml
View file

@ -29,6 +29,12 @@ dependencies:
javascript-time-ago:
specifier: 2.5.9
version: 2.5.9
linkify-html:
specifier: 4.1.1
version: 4.1.1(linkifyjs@4.1.1)
linkifyjs:
specifier: 4.1.1
version: 4.1.1
mux.js:
specifier: 6.3.0
version: 6.3.0
@ -3801,6 +3807,18 @@ packages:
lightningcss-win32-x64-msvc: 1.21.5
dev: true
/linkify-html@4.1.1(linkifyjs@4.1.1):
resolution: {integrity: sha512-7RcF7gIhEOGBBvs7orCJ2tevaz7iF0ZLZSRPWNNBOnW/uGjOOQYB+ztSeHF6dchMC2dM9H8zZlt6Z959bjteaw==}
peerDependencies:
linkifyjs: ^4.0.0
dependencies:
linkifyjs: 4.1.1
dev: false
/linkifyjs@4.1.1:
resolution: {integrity: sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA==}
dev: false
/local-pkg@0.4.3:
resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
engines: {node: '>=14'}

16
src/utils/HtmlUtils.js
View file

@ -4,22 +4,10 @@ export const purifyHTML = html => {
return DOMPurify.sanitize(html);
};
export const urlify = string => {
if (!string) return "";
const urlRegex = /(((https?:\/\/)|(www\.))[^\s]+)/g;
const emailRegex = /([\w-\\.]+@(?:[\w-]+\.)+[\w-]{2,4})/g;
return string
.replace(urlRegex, url => {
if (url.endsWith("</a>") || url.endsWith("<a")) return url;
return `<a href="${url}" target="_blank">${url}</a>`;
})
.replace(emailRegex, email => {
return `<a href="mailto:${email}">${email}</a>`;
});
};
import linkifyHtml from "linkify-html";
export const rewriteDescription = text => {
return urlify(text)
return linkifyHtml(text)
.replaceAll(/(?:http(?:s)?:\/\/)?(?:www\.)?youtube\.com(\/[/a-zA-Z0-9_?=&-]*)/gm, "$1")
.replaceAll(/(?:http(?:s)?:\/\/)?(?:www\.)?youtu\.be\/(?:watch\?v=)?([/a-zA-Z0-9_?=&-]*)/gm, "/watch?v=$1")
.replaceAll("\n", "<br>");