Merge pull request #294 from v0l/add-apple-music-embed
Add Apple Music embed
This commit is contained in:
commit
52e0809622
@ -8,7 +8,7 @@
|
|||||||
<meta name="description" content="Fast nostr web ui" />
|
<meta name="description" content="Fast nostr web ui" />
|
||||||
<meta
|
<meta
|
||||||
http-equiv="Content-Security-Policy"
|
http-equiv="Content-Security-Policy"
|
||||||
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; 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;" />
|
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;" />
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
|
||||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
||||||
|
@ -148,3 +148,9 @@ export const SpotifyRegex = /open\.spotify\.com\/(track|album|playlist|episode)\
|
|||||||
* Twitch embed regex
|
* Twitch embed regex
|
||||||
*/
|
*/
|
||||||
export const TwitchRegex = /twitch.tv\/([a-z0-9_]+$)/i;
|
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;
|
||||||
|
16
src/Element/AppleMusicEmbed.tsx
Normal file
16
src/Element/AppleMusicEmbed.tsx
Normal file
@ -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 (
|
||||||
|
<iframe
|
||||||
|
allow="autoplay *; encrypted-media *; fullscreen *; clipboard-write"
|
||||||
|
frameBorder="0"
|
||||||
|
height={isSongLink ? 175 : 450}
|
||||||
|
style={{ width: "100%", maxWidth: 660, overflow: "hidden", background: "transparent" }}
|
||||||
|
sandbox="allow-forms allow-popups allow-same-origin allow-scripts allow-storage-access-by-user-activation allow-top-navigation-by-user-activation"
|
||||||
|
src={convertedUrl}></iframe>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default AppleMusicEmbed;
|
@ -11,6 +11,7 @@ import {
|
|||||||
MixCloudRegex,
|
MixCloudRegex,
|
||||||
SpotifyRegex,
|
SpotifyRegex,
|
||||||
TwitchRegex,
|
TwitchRegex,
|
||||||
|
AppleMusicRegex,
|
||||||
} from "Const";
|
} from "Const";
|
||||||
import { RootState } from "State/Store";
|
import { RootState } from "State/Store";
|
||||||
import SoundCloudEmbed from "Element/SoundCloudEmded";
|
import SoundCloudEmbed from "Element/SoundCloudEmded";
|
||||||
@ -20,6 +21,7 @@ import TidalEmbed from "Element/TidalEmbed";
|
|||||||
import { ProxyImg } from "Element/ProxyImg";
|
import { ProxyImg } from "Element/ProxyImg";
|
||||||
import { HexKey } from "Nostr";
|
import { HexKey } from "Nostr";
|
||||||
import TwitchEmbed from "./TwitchEmbed";
|
import TwitchEmbed from "./TwitchEmbed";
|
||||||
|
import AppleMusicEmbed from "./AppleMusicEmbed";
|
||||||
|
|
||||||
export default function HyperText({ link, creator }: { link: string; creator: HexKey }) {
|
export default function HyperText({ link, creator }: { link: string; creator: HexKey }) {
|
||||||
const pref = useSelector((s: RootState) => s.login.preferences);
|
const pref = useSelector((s: RootState) => s.login.preferences);
|
||||||
@ -44,10 +46,11 @@ export default function HyperText({ link, creator }: { link: string; creator: He
|
|||||||
const tidalId = TidalRegex.test(a) && RegExp.$1;
|
const tidalId = TidalRegex.test(a) && RegExp.$1;
|
||||||
const soundcloundId = SoundCloudRegex.test(a) && RegExp.$1;
|
const soundcloundId = SoundCloudRegex.test(a) && RegExp.$1;
|
||||||
const mixcloudId = MixCloudRegex.test(a) && RegExp.$1;
|
const mixcloudId = MixCloudRegex.test(a) && RegExp.$1;
|
||||||
const spotifyId = SpotifyRegex.test(a);
|
const isSpotifyLink = SpotifyRegex.test(a);
|
||||||
const twitchId = TwitchRegex.test(a);
|
const isTwitchLink = TwitchRegex.test(a);
|
||||||
|
const isAppleMusicLink = AppleMusicRegex.test(a);
|
||||||
const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1;
|
const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1;
|
||||||
if (extension) {
|
if (extension && !isAppleMusicLink) {
|
||||||
switch (extension) {
|
switch (extension) {
|
||||||
case "gif":
|
case "gif":
|
||||||
case "jpg":
|
case "jpg":
|
||||||
@ -110,10 +113,12 @@ export default function HyperText({ link, creator }: { link: string; creator: He
|
|||||||
return <SoundCloudEmbed link={a} />;
|
return <SoundCloudEmbed link={a} />;
|
||||||
} else if (mixcloudId) {
|
} else if (mixcloudId) {
|
||||||
return <MixCloudEmbed link={a} />;
|
return <MixCloudEmbed link={a} />;
|
||||||
} else if (spotifyId) {
|
} else if (isSpotifyLink) {
|
||||||
return <SpotifyEmbed link={a} />;
|
return <SpotifyEmbed link={a} />;
|
||||||
} else if (twitchId) {
|
} else if (isTwitchLink) {
|
||||||
return <TwitchEmbed link={a} />;
|
return <TwitchEmbed link={a} />;
|
||||||
|
} else if (isAppleMusicLink) {
|
||||||
|
return <AppleMusicEmbed link={a} />;
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<a href={a} onClick={e => e.stopPropagation()} target="_blank" rel="noreferrer" className="ext">
|
<a href={a} onClick={e => e.stopPropagation()} target="_blank" rel="noreferrer" className="ext">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user