From dd6d42586db3a8cf337d81fcf7d00194357577fa Mon Sep 17 00:00:00 2001 From: Joshua Higgins Date: Sat, 13 Jun 2026 22:22:28 -0400 Subject: [PATCH] feat: sharing context menus, sharing songs --- app/(app)/album/[id]/page.tsx | 20 ++++- app/(app)/playlist/[id]/page.tsx | 18 ++-- components/album-card.tsx | 1 + components/album-view.tsx | 80 ++++++++++------- components/artist-view.tsx | 1 + components/artists-view.tsx | 2 + components/media-context-menu.tsx | 38 ++++++++ components/playlist-card.tsx | 1 + components/playlist-view.tsx | 143 ++++++++++++++---------------- components/search-song-item.tsx | 5 ++ components/songs-view.tsx | 5 ++ hooks/use-track-selection.ts | 21 ++++- lib/media-links.ts | 83 +++++++++++++++++ 13 files changed, 294 insertions(+), 124 deletions(-) create mode 100644 lib/media-links.ts diff --git a/app/(app)/album/[id]/page.tsx b/app/(app)/album/[id]/page.tsx index 49010b4..0967117 100644 --- a/app/(app)/album/[id]/page.tsx +++ b/app/(app)/album/[id]/page.tsx @@ -7,20 +7,33 @@ import { Metadata } from "next" interface PageProps { params: Promise<{ id: string }> + searchParams: Promise<{ s?: string }> } export async function generateMetadata({ params, + searchParams, }: PageProps): Promise { const { id } = await params + const { s: songId } = await searchParams const album = await fetchQuery(api.library.browseAlbumDetail, { id: id as Id<"albums">, }) + const sharedTrack = + album && songId + ? album.tracks.find((track) => track.id === songId) + : undefined + const pageTitle = sharedTrack + ? `${sharedTrack.title} - ${album!.title}` + : album + ? album.title + : null + return { title: `${album ? `${album.title} - oTunes` : "oTunes"}`, openGraph: { - title: `${album ? `${album.title} - oTunes` : "oTunes"}`, + title: `${pageTitle ? `${pageTitle} - oTunes` : "oTunes"}`, description: `${album ? album.artist.name : null}`, images: album ? { url: `/api/album/${album.id}/cover`, width: 512, height: 512 } @@ -29,8 +42,9 @@ export async function generateMetadata({ } } -export default async function Page({ params }: PageProps) { +export default async function Page({ params, searchParams }: PageProps) { const { id } = await params + const { s: highlightedSongId } = await searchParams const album = await fetchQuery(api.library.browseAlbumDetail, { id: id as Id<"albums">, }) @@ -53,5 +67,5 @@ export default async function Page({ params }: PageProps) { ) } - return + return } diff --git a/app/(app)/playlist/[id]/page.tsx b/app/(app)/playlist/[id]/page.tsx index 1571149..f2dbbf2 100644 --- a/app/(app)/playlist/[id]/page.tsx +++ b/app/(app)/playlist/[id]/page.tsx @@ -1,6 +1,7 @@ import { LibraryLoading } from "@/components/library-loading" import { PlaylistView } from "@/components/playlist-view" import { api } from "@/convex/_generated/api" +import { convexAuthNextjsToken } from "@convex-dev/auth/nextjs/server" import { fetchQuery } from "convex/nextjs" import type { Id } from "@/convex/_generated/dataModel" import { Metadata } from "next" @@ -9,13 +10,20 @@ interface PageProps { params: Promise<{ id: string }> } +async function fetchPlaylistDetail(id: Id<"playlists">) { + const token = await convexAuthNextjsToken() + return fetchQuery( + api.playlists.browsePlaylistDetail, + { id }, + { token } + ) +} + export async function generateMetadata({ params, }: PageProps): Promise { const { id } = await params - const playlist = await fetchQuery(api.playlists.browsePlaylistDetail, { - id: id as Id<"playlists">, - }) + const playlist = await fetchPlaylistDetail(id as Id<"playlists">) return { title: `${playlist ? `${playlist.title} - oTunes` : "oTunes"}`, @@ -31,9 +39,7 @@ export async function generateMetadata({ export default async function Page({ params }: PageProps) { const { id } = await params - const playlist = await fetchQuery(api.playlists.browsePlaylistDetail, { - id: id as Id<"playlists">, - }) + const playlist = await fetchPlaylistDetail(id as Id<"playlists">) if (playlist === undefined) { return ( diff --git a/components/album-card.tsx b/components/album-card.tsx index 37bc522..b9fde70 100644 --- a/components/album-card.tsx +++ b/components/album-card.tsx @@ -149,6 +149,7 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) { onAction={(action) => void handleCardAction(action)} favorited={isAlbumFavorite(album.id)} navigation={{ artist: { id: album.artist.id } }} + share={{ type: "album", albumId: album.id }} /> diff --git a/components/album-view.tsx b/components/album-view.tsx index a938669..b09aaf7 100644 --- a/components/album-view.tsx +++ b/components/album-view.tsx @@ -12,7 +12,7 @@ import { useAddToPlaylist } from "@/components/add-to-playlist-provider" import { FavoriteMediaButton } from "@/components/favorite-media-button" import { useFavorites } from "@/components/favorites-provider" import { usePlayback } from "@/components/playback-provider" -import { toast } from "sonner" +import { copyAlbumLink } from "@/lib/media-links" import { MediaContextMenu, @@ -46,15 +46,6 @@ function formatDuration(seconds: number): string { return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` } -function albumUrl(albumId: string) { - return `${window.location.origin}/album/${albumId}` -} - -async function copyAlbumLink(albumId: string) { - await navigator.clipboard.writeText(albumUrl(albumId)) - toast.success("Link Copied") -} - function formatMetadata(genre: string | null, year: number | null): string | null { const parts: string[] = [] if (genre) { @@ -120,10 +111,12 @@ function TrackRow({ onMediaAction, isNowPlaying, onPlay, + albumId, }: { track: BrowseAlbumTrack sectionIndex: number artist: BrowseAlbumDetail["artist"] + albumId: string isActive: boolean isSelected: boolean selectionPosition: SelectionRangePosition @@ -241,6 +234,12 @@ function TrackRow({ favorited={isFavorite} navigation={{ artist: { id: artist.id }, + album: { id: albumId }, + }} + share={{ + type: "song", + albumId, + songId: track.id, }} /> @@ -248,7 +247,13 @@ function TrackRow({ ) } -export function AlbumView({ album }: { album: BrowseAlbumDetail }) { +export function AlbumView({ + album, + highlightedSongId, +}: { + album: BrowseAlbumDetail + highlightedSongId?: string +}) { const { openAddToPlaylist } = useAddToPlaylist() const { isSongFavorite, @@ -266,6 +271,14 @@ export function AlbumView({ album }: { album: BrowseAlbumDetail }) { ) const metadata = formatMetadata(album.genre, album.year) const [activeTrackId, setActiveTrackId] = React.useState("") + const validHighlightedSongId = React.useMemo(() => { + if (!highlightedSongId) { + return undefined + } + return album.tracks.some((track) => track.id === highlightedSongId) + ? highlightedSongId + : undefined + }, [album.tracks, highlightedSongId]) const { selectedIds, @@ -275,7 +288,7 @@ export function AlbumView({ album }: { album: BrowseAlbumDetail }) { handlePointerDown, prepareContextMenu, clearSelection, - } = useTrackSelection(album.tracks) + } = useTrackSelection(album.tracks, validHighlightedSongId) const selectionPositions = React.useMemo( () => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds), @@ -348,28 +361,8 @@ export function AlbumView({ album }: { album: BrowseAlbumDetail }) {
-
- - {}} - onAction={handleAlbumMediaAction} - favorited={isAlbumFavorite(album.id)} - trackRowTrigger={false} - triggerClassName="size-8" - /> -
-
-
+
+ + {}} + onAction={handleAlbumMediaAction} + favorited={isAlbumFavorite(album.id)} + trackRowTrigger={false} + triggerVariant="secondary" + triggerClassName="rounded-full" + share={{ type: "album", albumId: album.id }} + />
@@ -455,6 +468,7 @@ export function AlbumView({ album }: { album: BrowseAlbumDetail }) { track={track} sectionIndex={sectionTrackIndex} artist={album.artist} + albumId={album.id} isActive={track.id === activeTrackId} isSelected={isSelected(track.id)} selectionPosition={selectionPositions[listIndex]} diff --git a/components/artist-view.tsx b/components/artist-view.tsx index adcfa17..2f8ca4a 100644 --- a/components/artist-view.tsx +++ b/components/artist-view.tsx @@ -126,6 +126,7 @@ export function ArtistView({ triggerVariant="secondary" triggerClassName="size-11 rounded-full" triggerIconClassName="size-4" + share={{ type: "artist", artistId: artist.id }} />
diff --git a/components/artists-view.tsx b/components/artists-view.tsx index b03fbe0..137412d 100644 --- a/components/artists-view.tsx +++ b/components/artists-view.tsx @@ -81,6 +81,7 @@ function ArtistListItem({ onOpenMenu={() => {}} onAction={onMediaAction} favorited={isFavorite} + share={{ type: "artist", artistId: artist.id }} />
) @@ -225,6 +226,7 @@ export function ArtistsView({ trackRowTrigger={false} triggerVariant="secondary" triggerClassName="rounded-full" + share={{ type: "artist", artistId: selectedArtist.id }} /> diff --git a/components/media-context-menu.tsx b/components/media-context-menu.tsx index 370da75..3c5b729 100644 --- a/components/media-context-menu.tsx +++ b/components/media-context-menu.tsx @@ -8,6 +8,7 @@ import { ListPlus, ListStart, MoreHorizontal, + Share2, Shuffle, Star, User, @@ -21,6 +22,10 @@ import { DropdownMenuSeparator, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu" +import { + copyMediaShareLink, + type MediaShareContext, +} from "@/lib/media-links" import { cn } from "@/lib/utils" export type MediaContextAction = @@ -35,6 +40,21 @@ export type MediaContextNavigation = { album?: { id: string } } +export type { MediaShareContext } from "@/lib/media-links" + +function shouldShowShare( + share: MediaShareContext | undefined, + selectedCount: number +) { + if (!share) { + return false + } + if (share.type === "song") { + return selectedCount === 1 + } + return true +} + function actionLabel(base: string, selectedCount: number) { return selectedCount > 1 ? `${base} (${selectedCount})` : base } @@ -46,6 +66,7 @@ export function MediaContextMenuItems({ showFavorite = true, favorited = false, navigation, + share, }: { selectedCount: number onAction: (action: MediaContextAction) => void @@ -53,11 +74,25 @@ export function MediaContextMenuItems({ showFavorite?: boolean favorited?: boolean navigation?: MediaContextNavigation + share?: MediaShareContext }) { const { artist, album } = navigation ?? {} + const showShare = shouldShowShare(share, selectedCount) return ( <> + {showShare ? ( + <> + void copyMediaShareLink(share!)} + > + Share + + + + + ) : null} onAction("playlist")} @@ -159,6 +194,7 @@ export function MediaContextMenu({ showFavorite = true, favorited = false, navigation, + share, inSelectionRange = false, trackRowTrigger = true, triggerClassName, @@ -175,6 +211,7 @@ export function MediaContextMenu({ showFavorite?: boolean favorited?: boolean navigation?: MediaContextNavigation + share?: MediaShareContext inSelectionRange?: boolean /** When false, the trigger uses default button/dropdown styling (page headers). */ trackRowTrigger?: boolean @@ -215,6 +252,7 @@ export function MediaContextMenu({ showFavorite={showFavorite} favorited={favorited} navigation={navigation} + share={share} /> {children} diff --git a/components/playlist-card.tsx b/components/playlist-card.tsx index 1b743e3..4a93037 100644 --- a/components/playlist-card.tsx +++ b/components/playlist-card.tsx @@ -94,6 +94,7 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) { selectedCount={1} showFavorite={false} onAction={(action) => void handleCardAction(action)} + share={{ type: "playlist", playlistId: playlist.id }} /> diff --git a/components/playlist-view.tsx b/components/playlist-view.tsx index 782f60a..1d836ec 100644 --- a/components/playlist-view.tsx +++ b/components/playlist-view.tsx @@ -3,15 +3,8 @@ import * as React from "react" import Image from "next/image" import { useRouter } from "next/navigation" -import { useMutation } from "convex/react" -import { - MoreHorizontal, - Play, - Share2, - Shuffle, - Star, - Trash2, -} from "lucide-react" +import { useMutation, useQuery } from "convex/react" +import { Play, Share2, Shuffle, Star, Trash2 } from "lucide-react" import { toast } from "sonner" import { useAddToPlaylist } from "@/components/add-to-playlist-provider" @@ -21,16 +14,12 @@ import { MediaCollectionFooter } from "@/components/media-collection-footer" import { TrackNumberPlayButton } from "@/components/track-number-play-button" import { MediaContextMenu, - MediaContextMenuItems, type MediaContextAction, } from "@/components/media-context-menu" import { Button } from "@/components/ui/button" import { - DropdownMenu, - DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, - DropdownMenuTrigger, } from "@/components/ui/dropdown-menu" import { ScrollArea } from "@/components/ui/scroll-area" import { useQueueMediaActions } from "@/hooks/use-queue-media-actions" @@ -39,6 +28,7 @@ import { api } from "@/convex/_generated/api" import type { Id } from "@/convex/_generated/dataModel" import type { BrowsePlaylistDetail, BrowseSong } from "@/convex/library" import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls" +import { copyPlaylistLink } from "@/lib/media-links" import { sumDurationSeconds } from "@/lib/media-summary" import { cn } from "@/lib/utils" import { @@ -61,18 +51,6 @@ function formatDuration(seconds: number): string { return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` } -function playlistUrl(playlist: BrowsePlaylistDetail) { - if (playlist.isFavorites) { - return `${window.location.origin}/playlist/favorites` - } - return `${window.location.origin}/playlist/${playlist.id}` -} - -async function copyPlaylistLink(playlist: BrowsePlaylistDetail) { - await navigator.clipboard.writeText(playlistUrl(playlist)) - toast.success("Link Copied") -} - function PlaylistSongCover({ song, inRange, @@ -259,6 +237,11 @@ function PlaylistSongRow({ artist: { id: song.artist.id }, album: { id: song.album.id }, }} + share={{ + type: "song", + albumId: song.album.id, + songId: song.id, + }} > {canRemove ? ( <> @@ -282,6 +265,11 @@ function PlaylistSongRow({ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { const router = useRouter() const isFavorites = playlist.isFavorites === true + const currentUser = useQuery(api.auth.currentUser) + const isOwner = + currentUser === undefined + ? playlist.isOwner + : currentUser?._id === playlist.owner.id const { openAddToPlaylist } = useAddToPlaylist() const { isSongFavorite, @@ -427,7 +415,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { } function handleDrop(targetIndex: number) { - if (isFavorites || !playlist.isOwner || dragIndex === null || dragIndex === targetIndex) { + if (isFavorites || !isOwner || dragIndex === null || dragIndex === targetIndex) { setDragIndex(null) return } @@ -479,54 +467,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
-
- {!isFavorites ? ( - - ) : null} - - - - - - - {playlist.isOwner && !isFavorites ? ( - <> - - - Delete Playlist - - - - ) : null} - - -
-
-
+
{isFavorites ? (
@@ -581,7 +523,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { Play - {!playlist.isOwner ? ( + {!isOwner ? ( + ) : null} + {}} + onAction={handlePlaylistMediaAction} + playlistLabel={ADD_TO_ANOTHER_PLAYLIST} + showFavorite={!isFavorites} + trackRowTrigger={false} + triggerVariant="secondary" + triggerClassName="rounded-full" + share={{ + type: "playlist", + playlistId: playlist.id ?? "favorites", + isFavorites, + }} + > + {isOwner && !isFavorites ? ( + <> + + + Delete Playlist + + + + ) : null} +
@@ -600,8 +587,8 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { key={song.id} song={song} index={index} - isOwner={playlist.isOwner && !isFavorites} - canRemove={isFavorites || playlist.isOwner} + isOwner={isOwner && !isFavorites} + canRemove={isFavorites || isOwner} showFavoriteInMenu={!isFavorites} removeLabel={ isFavorites ? "Unfavorite" : "Remove from Playlist" @@ -633,14 +620,14 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) { onMediaAction={handleMediaAction} onRemove={() => handleRemoveSong(song.id)} onDragStart={(event) => { - if (isFavorites || !playlist.isOwner) { + if (isFavorites || !isOwner) { return } setDragIndex(index) event.dataTransfer.effectAllowed = "move" }} onDragOver={(event) => { - if (isFavorites || !playlist.isOwner) { + if (isFavorites || !isOwner) { return } event.preventDefault() diff --git a/components/search-song-item.tsx b/components/search-song-item.tsx index 3093727..7210e66 100644 --- a/components/search-song-item.tsx +++ b/components/search-song-item.tsx @@ -71,6 +71,11 @@ export function SearchSongItem({ song }: { song: BrowseSong }) { artist: { id: song.artist.id }, album: { id: song.album.id }, }} + share={{ + type: "song", + albumId: song.album.id, + songId: song.id, + }} triggerClassName="size-8 shrink-0 opacity-0 transition-opacity group-hover:opacity-100 data-[state=open]:opacity-100" triggerVariant="ghost" /> diff --git a/components/songs-view.tsx b/components/songs-view.tsx index c3fd685..65c7773 100644 --- a/components/songs-view.tsx +++ b/components/songs-view.tsx @@ -249,6 +249,11 @@ function SongRow({ artist: { id: song.artist.id }, album: { id: song.album.id }, }} + share={{ + type: "song", + albumId: song.album.id, + songId: song.id, + }} />
diff --git a/hooks/use-track-selection.ts b/hooks/use-track-selection.ts index 32dcafc..c86bd3c 100644 --- a/hooks/use-track-selection.ts +++ b/hooks/use-track-selection.ts @@ -4,11 +4,24 @@ import * as React from "react" type Selectable = { id: string } -export function useTrackSelection(items: T[]) { - const [selectedIds, setSelectedIds] = React.useState>( - () => new Set() +export function useTrackSelection( + items: T[], + initialSelectedId?: string +) { + const initialIndex = + initialSelectedId !== undefined + ? items.findIndex((item) => item.id === initialSelectedId) + : -1 + + const [selectedIds, setSelectedIds] = React.useState>(() => { + if (initialIndex >= 0) { + return new Set([initialSelectedId!]) + } + return new Set() + }) + const anchorIndexRef = React.useRef( + initialIndex >= 0 ? initialIndex : null ) - const anchorIndexRef = React.useRef(null) const isSelected = React.useCallback( (id: string) => selectedIds.has(id), diff --git a/lib/media-links.ts b/lib/media-links.ts new file mode 100644 index 0000000..31d8c17 --- /dev/null +++ b/lib/media-links.ts @@ -0,0 +1,83 @@ +import { toast } from "sonner" + +export type MediaShareContext = + | { type: "album"; albumId: string } + | { type: "song"; albumId: string; songId: string } + | { type: "playlist"; playlistId: string; isFavorites?: boolean } + | { type: "artist"; artistId: string } + +function mediaOrigin() { + if (typeof window === "undefined") { + return "" + } + return window.location.origin +} + +export function albumShareUrl(albumId: string) { + return `${mediaOrigin()}/album/${albumId}` +} + +export function songShareUrl(albumId: string, songId: string) { + return `${mediaOrigin()}/album/${albumId}?s=${songId}` +} + +export function playlistShareUrl( + playlistId: string, + options?: { isFavorites?: boolean } +) { + if (options?.isFavorites) { + return `${mediaOrigin()}/playlist/favorites` + } + return `${mediaOrigin()}/playlist/${playlistId}` +} + +export function artistShareUrl(artistId: string) { + return `${mediaOrigin()}/artist/${artistId}` +} + +export function mediaShareUrl(share: MediaShareContext) { + switch (share.type) { + case "album": + return albumShareUrl(share.albumId) + case "song": + return songShareUrl(share.albumId, share.songId) + case "playlist": + return playlistShareUrl(share.playlistId, { + isFavorites: share.isFavorites, + }) + case "artist": + return artistShareUrl(share.artistId) + } +} + +export async function copyTextToClipboard(text: string) { + await navigator.clipboard.writeText(text) + toast.success("Link Copied") +} + +export async function copyMediaShareLink(share: MediaShareContext) { + await copyTextToClipboard(mediaShareUrl(share)) +} + +export async function copyAlbumLink(albumId: string) { + await copyMediaShareLink({ type: "album", albumId }) +} + +export async function copySongLink(albumId: string, songId: string) { + await copyMediaShareLink({ type: "song", albumId, songId }) +} + +export async function copyPlaylistLink( + playlistId: string, + options?: { isFavorites?: boolean } +) { + await copyMediaShareLink({ + type: "playlist", + playlistId, + isFavorites: options?.isFavorites, + }) +} + +export async function copyArtistLink(artistId: string) { + await copyMediaShareLink({ type: "artist", artistId }) +}