From 68b5d9efcbe7be30fbac7f70ba1a00327070e58d Mon Sep 17 00:00:00 2001 From: Sam Samskies Date: Mon, 13 Feb 2023 21:12:15 -0600 Subject: [PATCH] Add Apple Music embed --- public/index.html | 2 +- src/Const.ts | 6 ++++++ src/Element/AppleMusicEmbed.tsx | 16 ++++++++++++++++ src/Element/HyperText.tsx | 7 ++++++- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 src/Element/AppleMusicEmbed.tsx diff --git a/public/index.html b/public/index.html index db4da4b..6e96cf6 100644 --- a/public/index.html +++ b/public/index.html @@ -8,7 +8,7 @@ + content="default-src 'self'; child-src 'none'; worker-src 'self'; frame-src youtube.com www.youtube.com https://platform.twitter.com https://embed.tidal.com https://w.soundcloud.com https://www.mixcloud.com https://open.spotify.com https://player.twitch.tv https://embed.music.apple.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; connect-src wss://* ws://*:* 'self' https://*; img-src * data:; font-src https://fonts.gstatic.com; media-src *; script-src 'self' https://static.cloudflareinsights.com https://platform.twitter.com https://embed.tidal.com;" /> diff --git a/src/Const.ts b/src/Const.ts index 1fabf33..0b0ed22 100644 --- a/src/Const.ts +++ b/src/Const.ts @@ -146,3 +146,9 @@ export const SpotifyRegex = /open\.spotify\.com\/(track|album|playlist|episode)\ * Twitch embed regex */ export const TwitchRegex = /twitch.tv\/([a-z0-9_]+$)/i; + +/** + * Apple Music embed regex + */ +export const AppleMusicRegex = + /music\.apple\.com\/([a-z]{2}\/)?(?:album|playlist)\/[\w\d-]+\/([.a-zA-Z0-9-]+)(?:\?i=\d+)?/i; diff --git a/src/Element/AppleMusicEmbed.tsx b/src/Element/AppleMusicEmbed.tsx new file mode 100644 index 0000000..bba7e2c --- /dev/null +++ b/src/Element/AppleMusicEmbed.tsx @@ -0,0 +1,16 @@ +const AppleMusicEmbed = ({ link }: { link: string }) => { + const convertedUrl = link.replace("music.apple.com", "embed.music.apple.com"); + const isSongLink = /\?i=\d+$/.test(convertedUrl); + + return ( + + ); +}; + +export default AppleMusicEmbed; diff --git a/src/Element/HyperText.tsx b/src/Element/HyperText.tsx index 057812b..d05c13e 100644 --- a/src/Element/HyperText.tsx +++ b/src/Element/HyperText.tsx @@ -11,6 +11,7 @@ import { MixCloudRegex, SpotifyRegex, TwitchRegex, + AppleMusicRegex, } from "Const"; import { RootState } from "State/Store"; import SoundCloudEmbed from "Element/SoundCloudEmded"; @@ -20,6 +21,7 @@ import TidalEmbed from "Element/TidalEmbed"; import { ProxyImg } from "Element/ProxyImg"; import { HexKey } from "Nostr"; import TwitchEmbed from "./TwitchEmbed"; +import AppleMusicEmbed from "./AppleMusicEmbed"; export default function HyperText({ link, creator }: { link: string; creator: HexKey }) { const pref = useSelector((s: RootState) => s.login.preferences); @@ -46,8 +48,9 @@ export default function HyperText({ link, creator }: { link: string; creator: He const mixcloudId = MixCloudRegex.test(a) && RegExp.$1; const spotifyId = SpotifyRegex.test(a); const twitchId = TwitchRegex.test(a); + const appleMusicId = AppleMusicRegex.test(a); const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1; - if (extension) { + if (extension && !appleMusicId) { switch (extension) { case "gif": case "jpg": @@ -114,6 +117,8 @@ export default function HyperText({ link, creator }: { link: string; creator: He return ; } else if (twitchId) { return ; + } else if (appleMusicId) { + return ; } else { return ( e.stopPropagation()} target="_blank" rel="noreferrer" className="ext">