mirror of
https://github.com/TeamPiped/Piped.git
synced 2025-12-27 07:00:20 +00:00
conflicts resolved
This commit is contained in:
@@ -17,6 +17,9 @@ import {
|
||||
faXmark,
|
||||
faClone,
|
||||
faShare,
|
||||
faBook,
|
||||
faServer,
|
||||
faDonate,
|
||||
} from "@fortawesome/free-solid-svg-icons";
|
||||
import { faGithub, faBitcoin } from "@fortawesome/free-brands-svg-icons";
|
||||
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
|
||||
@@ -39,6 +42,9 @@ library.add(
|
||||
faXmark,
|
||||
faClone,
|
||||
faShare,
|
||||
faBook,
|
||||
faServer,
|
||||
faDonate,
|
||||
);
|
||||
|
||||
import router from "@/router/router.js";
|
||||
@@ -183,7 +189,7 @@ const mixin = {
|
||||
const emailRegex = /([\w-\\.]+@(?:[\w-]+\.)+[\w-]{2,4})/g;
|
||||
return string
|
||||
.replace(urlRegex, url => {
|
||||
if (url.endsWith("</a>")) return url;
|
||||
if (url.endsWith("</a>") || url.endsWith("<a")) return url;
|
||||
return `<a href="${url}" target="_blank">${url}</a>`;
|
||||
})
|
||||
.replace(emailRegex, email => {
|
||||
|
||||
Reference in New Issue
Block a user