From be1cd923cd3d9f3dd7ef612f8bb3be494ac35f50 Mon Sep 17 00:00:00 2001 From: Michael Rhee <77257032+blastshielddown@users.noreply.github.com> Date: Wed, 19 Apr 2023 16:24:11 -0500 Subject: [PATCH] Update regex for Wavlake embeds, ignore zine subdomain (#529) --- packages/app/src/Const.ts | 3 ++- packages/app/src/Element/WavlakeEmbed.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/app/src/Const.ts b/packages/app/src/Const.ts index 6228798d..1dd55da5 100644 --- a/packages/app/src/Const.ts +++ b/packages/app/src/Const.ts @@ -177,4 +177,5 @@ export const MagnetRegex = /(magnet:[\S]+)/i; /** * Wavlake embed regex */ -export const WavlakeRegex = /(?:player\.)?wavlake\.com\/(track\/[.a-zA-Z0-9-]+|album\/[.a-zA-Z0-9-]+|[.a-zA-Z0-9-]+)/i; +export const WavlakeRegex = + /(?!zine\.wavlake\.com)(?:player\.|www\.)?wavlake\.com\/(?:(?:track|album)\/[a-f0-9]{8}(?:-[a-f0-9]{4}){3}-[a-f0-9]{12}|[a-z-]+)$/i; diff --git a/packages/app/src/Element/WavlakeEmbed.tsx b/packages/app/src/Element/WavlakeEmbed.tsx index da2168f0..aa14a7b4 100644 --- a/packages/app/src/Element/WavlakeEmbed.tsx +++ b/packages/app/src/Element/WavlakeEmbed.tsx @@ -1,5 +1,5 @@ const WavlakeEmbed = ({ link }: { link: string }) => { - const convertedUrl = link.replace(/(?:player\.)?wavlake\.com/, "embed.wavlake.com"); + const convertedUrl = link.replace(/(?:player\.|www\.)?wavlake\.com/, "embed.wavlake.com"); return (