Compare commits

..
80 changed files with 640 additions and 1019 deletions

No files matched your search

+1 -3
View File
@@ -127,9 +127,7 @@ function TabsContent() {
tintColor={tabColors.tintColor} tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown" minimizeBehavior="onScrollDown"
{...(Platform.OS === "android" {...(Platform.OS === "android"
? // A new ripple color rebuilds Material's item backgrounds and ? { disableIndicator: true, rippleColor: tabColors.tintColor }
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
: {})} : {})}
> >
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? ( {Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
+1 -4
View File
@@ -62,10 +62,7 @@ export default function HomeScreen() {
return ( return (
<ScrollView <ScrollView
style={{ flex: 1, backgroundColor: colors.background }} style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[ contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentInsetAdjustmentBehavior="automatic" contentInsetAdjustmentBehavior="automatic"
> >
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} /> <HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
@@ -36,7 +36,7 @@ export default function FavoritesScreen() {
const colors = useThemeColors() const colors = useThemeColors()
const { config } = useServerConfig() const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail) const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites]) const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions() const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites() const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions() const { handleSongAction } = useMediaMenuActions()
@@ -45,8 +45,8 @@ export default function FavoritesScreen() {
usePlaylistSearch(songs) usePlaylistSearch(songs)
useEffect(() => { useEffect(() => {
rememberSongs(songs) if (favorites) rememberSongs(favorites.songs)
}, [songs]) }, [favorites])
const handlePlaySong = useCallback( const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds), (song: BrowseSong) => void playFromSong(song.id, songIds),
@@ -23,16 +23,19 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500 const PAGE_SIZE = 500
type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page> type CatalogPage = FunctionReturnType<typeof api.intentCatalog.page>
type Favorites = FunctionReturnType<typeof api.favorites.getUserFavorites> type Favorites = {
favoriteSongs: string[]
favoriteAlbums: string[]
favoriteArtists: string[]
}
function favoriteIds(favorites: Favorites, kind: LibraryKind) { function favoriteIds(favorites: Favorites, kind: LibraryKind) {
return new Set<string>( return new Set<string>(
(kind === "song" kind === "song"
? favorites.favoriteSongs ? favorites.favoriteSongs
: kind === "album" : kind === "album"
? favorites.favoriteAlbums ? favorites.favoriteAlbums
: favorites.favoriteArtists : favorites.favoriteArtists
).flat()
) )
} }
@@ -214,13 +214,12 @@ export function useIntentDispatch() {
) )
} }
if (kind === "artist") { if (kind === "artist") {
const chunks = await fetchCachedQuery( return fetchCachedQuery(
convex, convex,
cacheScope, cacheScope,
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> } { artistId: id as Id<"artists"> }
) )
return chunks.flat()
} }
if (kind === "playlist") { if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) { if (id === FAVORITES_PLAYLIST_ID) {
@@ -230,7 +229,7 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites, api.favorites.getUserFavorites,
{} {}
) )
return favorites.favoriteSongs.flat() return favorites.favoriteSongs
} }
return fetchCachedQuery( return fetchCachedQuery(
convex, convex,
@@ -392,18 +391,17 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites, api.favorites.getUserFavorites,
{} {}
) )
const favoriteSongs = favorites.favoriteSongs.flat() if (favorites.favoriteSongs.length === 0) {
if (favoriteSongs.length === 0) {
throw new IntentRejected( throw new IntentRejected(
"Nothing is queued, and your favorites are empty." "Nothing is queued, and your favorites are empty."
) )
} }
if (shuffled) { if (shuffled) {
ensureActive(invocation) ensureActive(invocation)
await actions.playShuffled(favoriteSongs) await actions.playShuffled(favorites.favoriteSongs)
} else { } else {
ensureActive(invocation) ensureActive(invocation)
await actions.playInOrder(favoriteSongs) await actions.playInOrder(favorites.favoriteSongs)
} }
return return
} }
@@ -71,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
} }
} }
export function ConvexAuthRecovery({ export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth() const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth() const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false) const hadServerAuthRef = useRef(false)
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
const sessionEstablished = Boolean( const sessionEstablished = Boolean(
serverAuth && serverAuth &&
!serverAuth.isLoading && !serverAuth.isLoading &&
!serverAuth.isRefreshing && !serverAuth.isRefreshing &&
serverAuth.isAuthenticated serverAuth.isAuthenticated
) )
return ( return (
@@ -112,10 +112,7 @@ function SwipeRowBody({
setIsOpen(false) setIsOpen(false)
}, [removing, translateX]) }, [removing, translateX])
const handleSwipeStart = useCallback( const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
() => group.setOpen(close),
[close, group]
)
const handleSettle = useCallback( const handleSettle = useCallback(
(open: boolean) => { (open: boolean) => {
@@ -254,7 +251,8 @@ function SwipeRowBody({
const pillWidth = Math.max( const pillWidth = Math.max(
0, 0,
resting + resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value (revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
) )
const restingHeight = interpolate( const restingHeight = interpolate(
pillWidth, pillWidth,
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId } { artistId }
) )
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds.flat()) setPendingSongIds(songIds)
setOpen(true) setOpen(true)
} catch (error) { } catch (error) {
if (selectionRequestIdRef.current !== requestId) return if (selectionRequestIdRef.current !== requestId) return
+3 -3
View File
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
) )
const songIds = useMemo( const songIds = useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()), () => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs] [favorites?.favoriteSongs]
) )
const albumIds = useMemo( const albumIds = useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()), () => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums] [favorites?.favoriteAlbums]
) )
const artistIds = useMemo( const artistIds = useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()), () => new Set(favorites?.favoriteArtists.map(String) ?? []),
[favorites?.favoriteArtists] [favorites?.favoriteArtists]
) )
const idsRef = useRef({ songIds, albumIds, artistIds }) const idsRef = useRef({ songIds, albumIds, artistIds })
+7 -9
View File
@@ -401,7 +401,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope, cacheScope,
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId } { artistId }
).then((chunks) => chunks.flat()), ),
recorded: { entity: { kind: "artist", id: artistId } }, recorded: { entity: { kind: "artist", id: artistId } },
})) }))
const playlist = collection( const playlist = collection(
@@ -482,14 +482,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[] let songIds: Id<"songs">[]
try { try {
songIds = ( songIds = await fetchCachedQuery(
await fetchCachedQuery( convex,
convex, cacheScope,
cacheScope, api.library.browseSortedSongIds,
api.library.browseSortedSongIds, sort
sort )
)
).flat()
} catch { } catch {
return return
} }
+1 -5
View File
@@ -83,11 +83,7 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null) const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches = const swatches =
resolved.key === key resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
? resolved.swatches
: key
? cachedSwatches(key)
: null
useEffect(() => { useEffect(() => {
if (!key || hasCover === false) return if (!key || hasCover === false) return
+1 -1
View File
@@ -173,7 +173,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> } { artistId: artist.id as Id<"artists"> }
) )
await runQueueAction(action, songIds.flat()) await runQueueAction(action, songIds)
break break
} }
default: default:
+4 -1
View File
@@ -1,6 +1,9 @@
import { ConvexError, type Value } from "convex/values" import { ConvexError, type Value } from "convex/values"
const AUTH_ERROR_MESSAGES = new Set(["Not authenticated", "User not logged in"]) const AUTH_ERROR_MESSAGES = new Set([
"Not authenticated",
"User not logged in",
])
function matchesAuthMessage(message: string): boolean { function matchesAuthMessage(message: string): boolean {
if (AUTH_ERROR_MESSAGES.has(message)) { if (AUTH_ERROR_MESSAGES.has(message)) {
+1 -3
View File
@@ -37,9 +37,7 @@ export function authStorageKey(key: string, storageNamespace: string): string {
return `${key}_${escapedNamespace}` return `${key}_${escapedNamespace}`
} }
export async function clearStoredAuthTokens( export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
storageNamespace: string
): Promise<void> {
await Promise.all( await Promise.all(
AUTH_STORAGE_KEYS.map((key) => AUTH_STORAGE_KEYS.map((key) =>
secureRemoveItem(authStorageKey(key, storageNamespace)) secureRemoveItem(authStorageKey(key, storageNamespace))
+1 -4
View File
@@ -5,10 +5,7 @@ export function formatDuration(seconds: number): string {
return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}` return `${minutes}:${remainingSeconds.toString().padStart(2, "0")}`
} }
export function formatRemainingDuration( export function formatRemainingDuration(current: number, total: number): string {
current: number,
total: number
): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current)) const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}` return `-${formatDuration(remaining)}`
} }
+5 -17
View File
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground), secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent), accent: toHex(accent),
accentForeground: toHex(accentForeground), accentForeground: toHex(accentForeground),
accentText: toHex( accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)), surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)), divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText, isDark: lightText,
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86)) ? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2)) : withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped) const y = luminance(clamped)
if ( if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
return clamped return clamped
} }
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
} }
function prefersLightText(background: Rgb) { function prefersLightText(background: Rgb) {
return ( return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
} }
/** Moves `color`'s lightness away from `background` until it reaches `min`. */ /** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid high = mid
} }
} }
return withLightness( return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
} }
/** `amount` of `color` over `base`. */ /** `amount` of `color` over `base`. */
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
} }
function fromLinear(value: number) { function fromLinear(value: number) {
const c = const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
return c * 255 return c * 255
} }
+1 -4
View File
@@ -13,10 +13,7 @@ const SERVER_CONFIG_KEY = "otunes.server-config"
const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config" const LEGACY_SERVER_CONFIG_KEY = "otunes:server-config"
function normalizeHostnameInput(input: string): string { function normalizeHostnameInput(input: string): string {
return input return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
} }
function buildServerUrl(hostname: string): string { function buildServerUrl(hostname: string): string {
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel <ContentCarousel
title="Recently Added" title="Recently Added"
href="/recently-added" href="/recently-added"
content={recentlyAdded.flat()} content={recentlyAdded}
/> />
</div> </div>
</div> </div>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : ( ) : (
<div className="flex-1 overflow-y-auto p-6 pb-28"> <div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}> <div className={albumGridClassName}>
{albums.flat().map((album) => ( {albums.map((album) => (
<AlbumCard key={album.id} album={album} /> <AlbumCard key={album.id} album={album} />
))} ))}
</div> </div>
+1 -1
View File
@@ -18,7 +18,7 @@ export default function Page() {
) : ( ) : (
<div className="flex-1 overflow-y-auto p-6 pb-28"> <div className="flex-1 overflow-y-auto p-6 pb-28">
<div className={albumGridClassName}> <div className={albumGridClassName}>
{albums.flat().map((album) => ( {albums.map((album) => (
<AlbumCard key={album.id} album={album} /> <AlbumCard key={album.id} album={album} />
))} ))}
</div> </div>
+5 -1
View File
@@ -8,7 +8,11 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types" import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) { function RecentlyPlayedCard({
item,
}: {
item: BrowseAlbum | PlaylistSummary
}) {
if ("owner" in item) { if ("owner" in item) {
return <PlaylistCard playlist={item} /> return <PlaylistCard playlist={item} />
} }
+5 -5
View File
@@ -9,10 +9,7 @@ import { ContentCarousel } from "@/components/content-carousel"
import { SearchResultsSkeleton } from "@/components/library-skeletons" import { SearchResultsSkeleton } from "@/components/library-skeletons"
import { SearchPrompt } from "@/components/search-prompt" import { SearchPrompt } from "@/components/search-prompt"
import { SearchSongItem } from "@/components/search-song-item" import { SearchSongItem } from "@/components/search-song-item"
import { import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
SearchTopResultCard,
type TopResult,
} from "@/components/search-top-result-card"
import { useCachedQuery } from "@/hooks/use-cached-query" import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api" import { api } from "@otunes/convex/_generated/api"
@@ -110,7 +107,10 @@ function SearchResults({ query }: { query: string }) {
)} )}
{showPlaylists && ( {showPlaylists && (
<ContentCarousel title="Playlists" content={playlistResults ?? []} /> <ContentCarousel
title="Playlists"
content={playlistResults ?? []}
/>
)} )}
</div> </div>
</div> </div>
@@ -42,9 +42,7 @@ function formatAddToPlaylistToast(
} }
const addedLabel = const addedLabel =
addedCount > 1 addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
? `Added ${addedCount} songs to ${title}`
: `Added to ${title}`
if (skippedCount === 0) { if (skippedCount === 0) {
return addedLabel return addedLabel
@@ -66,15 +64,14 @@ type AddToPlaylistContextValue = {
openCreatePlaylist: () => void openCreatePlaylist: () => void
} }
const AddToPlaylistContext = const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
React.createContext<AddToPlaylistContextValue | null>(null) null
)
export function useAddToPlaylist() { export function useAddToPlaylist() {
const context = React.useContext(AddToPlaylistContext) const context = React.useContext(AddToPlaylistContext)
if (!context) { if (!context) {
throw new Error( throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
"useAddToPlaylist must be used within AddToPlaylistProvider"
)
} }
return context return context
} }
@@ -184,7 +181,7 @@ export function AddToPlaylistProvider({
} }
) )
if (requestId === selectionRequestRef.current) { if (requestId === selectionRequestRef.current) {
showAddToPlaylist(songIds.flat()) showAddToPlaylist(songIds)
} }
} catch (error) { } catch (error) {
if (requestId === selectionRequestRef.current) { if (requestId === selectionRequestRef.current) {
@@ -204,10 +201,7 @@ export function AddToPlaylistProvider({
setCreateOpen(true) setCreateOpen(true)
}, []) }, [])
async function handleAddToPlaylist( async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
playlistId: Id<"playlists">,
title: string
) {
setIsSubmitting(true) setIsSubmitting(true)
try { try {
const { addedCount, skippedCount } = await addSongs({ const { addedCount, skippedCount } = await addSongs({
+7 -2
View File
@@ -104,7 +104,10 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
onMouseEnter={() => setHovered(true)} onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)} onMouseLeave={() => setHovered(false)}
> >
<Link className="absolute inset-0" href={"/album/" + album.id}> <Link
className="absolute inset-0"
href={"/album/" + album.id}
>
<Image <Image
src={albumCoverUrl(album.id)} src={albumCoverUrl(album.id)}
alt={album.title} alt={album.title}
@@ -173,7 +176,9 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
href={"/artist/" + album.artist.id} href={"/artist/" + album.artist.id}
className="text-muted-foreground decoration-muted-foreground hover:underline" className="text-muted-foreground decoration-muted-foreground hover:underline"
> >
<p className="truncate text-xs">{album.artist.name}</p> <p className="truncate text-xs">
{album.artist.name}
</p>
</Link> </Link>
</div> </div>
</div> </div>
+6 -21
View File
@@ -44,10 +44,7 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary" import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache" import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
function formatMetadata( function formatMetadata(genre: string | null, year: number | null): string | null {
genre: string | null,
year: number | null
): string | null {
const parts: string[] = [] const parts: string[] = []
if (genre) { if (genre) {
parts.push(genre) parts.push(genre)
@@ -63,9 +60,7 @@ type AlbumTrackSection = {
tracks: BrowseAlbumTrack[] tracks: BrowseAlbumTrack[]
} }
function groupAlbumTracksByDisk( function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
tracks: BrowseAlbumTrack[]
): AlbumTrackSection[] {
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null) const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
if (!hasDiskNumbers) { if (!hasDiskNumbers) {
return [{ label: null, tracks }] return [{ label: null, tracks }]
@@ -143,11 +138,7 @@ export function AlbumView({
} = useTrackSelection(album.tracks, validHighlightedSongId) } = useTrackSelection(album.tracks, validHighlightedSongId)
const selectionPositions = React.useMemo( const selectionPositions = React.useMemo(
() => () => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
getSelectionRangePositions(
album.tracks.map((track) => track.id),
selectedIds
),
[album.tracks, selectedIds] [album.tracks, selectedIds]
) )
@@ -201,11 +192,7 @@ export function AlbumView({
const handleRowPlay = React.useCallback( const handleRowPlay = React.useCallback(
(index: number) => { (index: number) => {
void playFromSong( void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
album.tracks[index].id,
albumSongIds,
`album:${album.id}`
)
}, },
[album.tracks, album.id, albumSongIds, playFromSong] [album.tracks, album.id, albumSongIds, playFromSong]
) )
@@ -228,7 +215,7 @@ export function AlbumView({
<PageHeader openApp /> <PageHeader openApp />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!"> <ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<div className="pb-28"> <div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0"> <div className="mx-auto w-full min-w-0 max-w-9/10">
<div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end"> <div className="flex flex-col gap-8 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0"> <div className="relative mx-auto aspect-square w-full max-w-60 shrink-0 overflow-hidden rounded-lg ring-1 ring-foreground/10 sm:mx-0">
<Image <Image
@@ -358,9 +345,7 @@ export function AlbumView({
song={trackSongs.get(track.id)!} song={trackSongs.get(track.id)!}
index={listIndex} index={listIndex}
trackNumber={ trackNumber={
track.track > 0 track.track > 0 ? track.track : sectionTrackIndex + 1
? track.track
: sectionTrackIndex + 1
} }
subtitle={track.artists?.join(", ")} subtitle={track.artists?.join(", ")}
isActive={track.id === activeTrackId} isActive={track.id === activeTrackId}
+2 -2
View File
@@ -32,8 +32,8 @@ export function ArtistsPage() {
<ArtistsSkeleton /> <ArtistsSkeleton />
) : ( ) : (
<ArtistsView <ArtistsView
artists={artists.flat()} artists={artists}
albums={albums.flat()} albums={albums}
artistId={artistIdFromPathname(pathname)} artistId={artistIdFromPathname(pathname)}
onSelectArtist={selectArtist} onSelectArtist={selectArtist}
/> />
+54 -59
View File
@@ -13,12 +13,7 @@ import {
CardHeader, CardHeader,
CardTitle, CardTitle,
} from "@/components/ui/card" } from "@/components/ui/card"
import { import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
Field,
FieldError,
FieldGroup,
FieldLabel,
} from "@/components/ui/field"
import { Input } from "@/components/ui/input" import { Input } from "@/components/ui/input"
import { Spinner } from "@/components/ui/spinner" import { Spinner } from "@/components/ui/spinner"
@@ -106,64 +101,64 @@ export function AuthForm({
administrator if you need access. administrator if you need access.
</p> </p>
) : ( ) : (
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
<FieldGroup> <FieldGroup>
{flow === "signUp" && ( {flow === "signUp" && (
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
required
/>
</Field>
)}
<Field> <Field>
<FieldLabel htmlFor="email">Email</FieldLabel> <FieldLabel htmlFor="name">Name</FieldLabel>
<Input <Input
id="email" id="name"
name="email" name="name"
type="email" type="text"
autoComplete="email" autoComplete="name"
placeholder="you@example.com" placeholder="Ada Lovelace"
required required
/> />
</Field> </Field>
<Field> )}
<FieldLabel htmlFor="password">Password</FieldLabel> <Field>
<Input <FieldLabel htmlFor="email">Email</FieldLabel>
id="password" <Input
name="password" id="email"
type="password" name="email"
autoComplete={ type="email"
flow === "signIn" ? "current-password" : "new-password" autoComplete="email"
} placeholder="you@example.com"
required required
/> />
</Field> </Field>
{error && <FieldError>{error}</FieldError>} <Field>
<Field> <FieldLabel htmlFor="password">Password</FieldLabel>
<Button type="submit" disabled={submitting}> <Input
{submitting && <Spinner />} id="password"
{text.submit} name="password"
</Button> type="password"
</Field> autoComplete={
{!hideSignUpLink ? ( flow === "signIn" ? "current-password" : "new-password"
<p className="text-center text-sm text-muted-foreground"> }
{text.switchPrompt}{" "} required
<Link />
href={text.switchHref} </Field>
className="text-primary underline-offset-4 hover:underline" {error && <FieldError>{error}</FieldError>}
> <Field>
{text.switchLabel} <Button type="submit" disabled={submitting}>
</Link> {submitting && <Spinner />}
</p> {text.submit}
) : null} </Button>
</FieldGroup> </Field>
</form> {!hideSignUpLink ? (
<p className="text-center text-sm text-muted-foreground">
{text.switchPrompt}{" "}
<Link
href={text.switchHref}
className="text-primary underline-offset-4 hover:underline"
>
{text.switchLabel}
</Link>
</p>
) : null}
</FieldGroup>
</form>
)} )}
</CardContent> </CardContent>
</Card> </Card>
@@ -39,7 +39,6 @@ export function ConvexClientProvider({
}) { }) {
return ( return (
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}> <ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "} <PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
</ConvexAuthNextjsProvider>
) )
} }
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
className={cn( className={cn(
"rounded-full", "rounded-full",
!isFavorite && !isFavorite &&
"hover:border-transparent hover:bg-primary hover:text-primary-foreground", "hover:bg-primary hover:text-primary-foreground hover:border-transparent",
className className
)} )}
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel} aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
+3 -3
View File
@@ -86,15 +86,15 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
) )
const songIds = React.useMemo( const songIds = React.useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()), () => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs] [favorites?.favoriteSongs]
) )
const albumIds = React.useMemo( const albumIds = React.useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()), () => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums] [favorites?.favoriteAlbums]
) )
const artistIds = React.useMemo( const artistIds = React.useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()), () => new Set(favorites?.favoriteArtists.map(String) ?? []),
[favorites?.favoriteArtists] [favorites?.favoriteArtists]
) )
@@ -1,4 +1,7 @@
import { formatMediaSummary, formatReleaseDate } from "@/lib/media-summary" import {
formatMediaSummary,
formatReleaseDate,
} from "@/lib/media-summary"
import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles" import { TRACK_ROW_PADDING } from "@/lib/selection-range-styles"
export function MediaCollectionFooter({ export function MediaCollectionFooter({
+10 -5
View File
@@ -1,7 +1,12 @@
"use client" "use client"
import { useAction, useMutation, useQuery } from "convex/react" import { useAction, useMutation, useQuery } from "convex/react"
import { MoreHorizontal, Trash2, Upload, UserPlus } from "lucide-react" import {
MoreHorizontal,
Trash2,
Upload,
UserPlus,
} from "lucide-react"
import { useCallback, useEffect, useRef, useState } from "react" import { useCallback, useEffect, useRef, useState } from "react"
import { toast } from "sonner" import { toast } from "sonner"
@@ -148,7 +153,9 @@ function UserAvatar({
key={user.image ?? "fallback"} key={user.image ?? "fallback"}
size={size === "sm" ? "sm" : "default"} size={size === "sm" ? "sm" : "default"}
> >
{user.image ? <AvatarImage src={user.image} alt={user.name} /> : null} {user.image ? (
<AvatarImage src={user.image} alt={user.name} />
) : null}
<AvatarFallback>{initials}</AvatarFallback> <AvatarFallback>{initials}</AvatarFallback>
</Avatar> </Avatar>
) )
@@ -684,9 +691,7 @@ function UserRowActions({
setAdmin({ userId: user._id, isAdmin: !user.isAdmin }) setAdmin({ userId: user._id, isAdmin: !user.isAdmin })
.then(() => .then(() =>
toast.success( toast.success(
user.isAdmin user.isAdmin ? "Admin access removed" : "User is now admin"
? "Admin access removed"
: "User is now admin"
) )
) )
.catch((error: Error) => toast.error(error.message)) .catch((error: Error) => toast.error(error.message))
+34 -36
View File
@@ -341,7 +341,9 @@ export function useIsPlaying() {
export function usePlaybackProgress() { export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext) const context = useContext(PlaybackProgressContext)
if (!context) { if (!context) {
throw new Error("usePlaybackProgress must be used within PlaybackProvider") throw new Error(
"usePlaybackProgress must be used within PlaybackProvider"
)
} }
return context return context
} }
@@ -364,11 +366,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
api.playback.getPlaybackState, api.playback.getPlaybackState,
isSignedIn ? {} : "skip" isSignedIn ? {} : "skip"
) )
const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState) const syncPlaybackStateMutation = useMutation(
const recordPlayMutation = useMutation(api.playback.recordPlay) api.playback.syncPlaybackState
const updateSongProgressMutation = useMutation(
api.playback.updateSongProgress
) )
const recordPlayMutation = useMutation(api.playback.recordPlay)
const updateSongProgressMutation = useMutation(api.playback.updateSongProgress)
useEffect(() => { useEffect(() => {
if (!isSignedIn) { if (!isSignedIn) {
@@ -476,27 +478,31 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const isPlaybackActive = Boolean(currentSongId && isPlaying) const isPlaybackActive = Boolean(currentSongId && isPlaying)
const repeatEnabled = playback.repeatEnabled const repeatEnabled = playback.repeatEnabled
const queueLength = queueSongIds.length const queueLength = queueSongIds.length
const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null const nextQueueSongId =
queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongDoc = useCachedQuery( const nextQueueSongDoc = useCachedQuery(
api.library.getSongPlaybackInfo, api.library.getSongPlaybackInfo,
nextQueueSongId ? { id: nextQueueSongId } : "skip" nextQueueSongId ? { id: nextQueueSongId } : "skip"
) )
const seekTo = useCallback((seconds: number) => { const seekTo = useCallback(
const audio = audioRef.current (seconds: number) => {
if (!audio) { const audio = audioRef.current
return if (!audio) {
} return
}
const maxDuration = const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0 Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration ? audio.duration
: durationRef.current : durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0)) const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped audio.currentTime = clamped
currentTimeRef.current = clamped currentTimeRef.current = clamped
setCurrentTime(clamped) setCurrentTime(clamped)
}, []) },
[]
)
const saveProgress = useCallback( const saveProgress = useCallback(
(seconds: number) => { (seconds: number) => {
@@ -949,13 +955,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
} }
const preloadAudio = preloadAudioRef.current const preloadAudio = preloadAudioRef.current
if ( if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) {
shouldContinuePlaying &&
preloadAudio &&
nextQueueSongId &&
user &&
nextQueueSongDoc
) {
const settings = playbackLoadSettings( const settings = playbackLoadSettings(
user, user,
dolbyAtmosSupported, dolbyAtmosSupported,
@@ -1233,14 +1233,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[] let songIds: Id<"songs">[]
try { try {
songIds = ( songIds = await fetchCachedQuery(
await fetchCachedQuery( convex,
convex, cacheScope,
cacheScope, api.library.browseSortedSongIds,
api.library.browseSortedSongIds, sort
sort )
)
).flat()
} catch { } catch {
return return
} }
@@ -1270,7 +1268,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope, cacheScope,
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId } { artistId }
).then((chunks) => chunks.flat()), ),
[convex, cacheScope] [convex, cacheScope]
) )
+1 -3
View File
@@ -34,7 +34,5 @@ export function FavoritesPlaylistPage() {
return <PageMessage>Sign in to view your favorites.</PageMessage> return <PageMessage>Sign in to view your favorites.</PageMessage>
} }
return ( return <PlaylistView playlist={favorites} />
<PlaylistView playlist={{ ...favorites, songs: favorites.songs.flat() }} />
)
} }
+3 -10
View File
@@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) {
showAlbum={false} showAlbum={false}
/> />
<span className="shrink-0 text-xs text-muted-foreground tabular-nums"> <span className="shrink-0 text-xs tabular-nums text-muted-foreground">
{formatDuration(song.durationSeconds)} {formatDuration(song.durationSeconds)}
</span> </span>
</div> </div>
@@ -218,11 +218,7 @@ export function QueuePanel() {
(index) => selectableQueue[index].queueIndex (index) => selectableQueue[index].queueIndex
) )
const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex
const next = moveQueueBlock( const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex)
queueSongIds,
fromQueueIndices,
targetQueueIndex
)
setDragIndex(null) setDragIndex(null)
@@ -267,10 +263,7 @@ export function QueuePanel() {
{historySongs.length > 0 ? ( {historySongs.length > 0 ? (
<ul className="flex flex-col border-b py-1"> <ul className="flex flex-col border-b py-1">
{historySongs.map((song) => ( {historySongs.map((song) => (
<HistorySongRow <HistorySongRow key={`history-${song.id}-${song.historyIndex}`} song={song} />
key={`history-${song.id}-${song.historyIndex}`}
song={song}
/>
))} ))}
</ul> </ul>
) : null} ) : null}
+2 -1
View File
@@ -50,7 +50,8 @@ export function SongsView() {
const { isSongFavorite, toggleSongFavorite } = useFavorites() const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { playFromLibrarySong } = usePlaybackActions() const { playFromLibrarySong } = usePlaybackActions()
const [sortKey, setSortKey] = useState<SortKey>("title") const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] = useState<SortDirection>("asc") const [sortDirection, setSortDirection] =
useState<SortDirection>("asc")
const loadMoreRef = useRef<HTMLDivElement>(null) const loadMoreRef = useRef<HTMLDivElement>(null)
const { results, status, loadMore, isCached } = useCachedPaginatedQuery( const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
+2 -1
View File
@@ -29,7 +29,8 @@ function ThemeFavicon() {
return return
} }
const href = resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png" const href =
resolvedTheme === "dark" ? "/favicon-dark.png" : "/favicon.png"
for (const rel of ["icon", "shortcut icon"] as const) { for (const rel of ["icon", "shortcut icon"] as const) {
let link = document.querySelector<HTMLLinkElement>(`link[rel="${rel}"]`) let link = document.querySelector<HTMLLinkElement>(`link[rel="${rel}"]`)
+9 -31
View File
@@ -155,9 +155,7 @@ function FavoriteStarButton({
: "text-primary hover:text-primary", : "text-primary hover:text-primary",
className className
)} )}
aria-label={ aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`
}
onClick={(event) => { onClick={(event) => {
event.stopPropagation() event.stopPropagation()
onToggle() onToggle()
@@ -177,7 +175,7 @@ function ExplicitBadge({ inRange }: { inRange: boolean }) {
return ( return (
<span <span
className={cn( className={cn(
"ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] leading-none font-semibold", "ml-1.5 inline-flex size-3.5 shrink-0 items-center justify-center rounded-sm text-[9px] font-semibold leading-none",
inRange inRange
? "bg-white/20 text-primary-foreground" ? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground" : "bg-muted-foreground/20 text-muted-foreground"
@@ -221,13 +219,7 @@ function TrackTitle({
export function LibraryTrackListHeader() { export function LibraryTrackListHeader() {
const labelClass = "text-xs text-muted-foreground" const labelClass = "text-xs text-muted-foreground"
return ( return (
<div <div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
className={cn(
"flex h-9 items-center",
LIBRARY_ROW_LAYOUT,
TRACK_ROW_PADDING
)}
>
<div className={LIBRARY_NAME_COLUMNS}> <div className={LIBRARY_NAME_COLUMNS}>
<span aria-hidden /> <span aria-hidden />
<span aria-hidden /> <span aria-hidden />
@@ -354,16 +346,10 @@ function TrackRowComponent({
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline" ? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline" : "text-muted-foreground hover:text-foreground hover:underline"
content = ( content = (
<div <div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}
>
<div className={LIBRARY_NAME_COLUMNS}> <div className={LIBRARY_NAME_COLUMNS}>
{favoriteStar} {favoriteStar}
<TrackCover <TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40"> <div className="absolute inset-0 flex items-center justify-center bg-black/0 transition-colors group-hover:bg-black/40">
<Button <Button
size="icon-sm" size="icon-sm"
@@ -408,9 +394,7 @@ function TrackRowComponent({
} }
case "album": case "album":
content = ( content = (
<div <div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
{favoriteStar} {favoriteStar}
{trackNumberButton} {trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} /> <TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
@@ -421,14 +405,8 @@ function TrackRowComponent({
break break
case "playlist": case "playlist":
content = ( content = (
<div <div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)} <TrackCover albumId={song.album.id} alt={song.album.title} inRange={inRange}>
>
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
>
<div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100"> <div className="absolute inset-0 flex items-center justify-center bg-black/0 opacity-0 transition-opacity group-hover/cover:bg-black/40 group-hover/cover:opacity-100">
<FavoriteStarButton <FavoriteStarButton
title={song.title} title={song.title}
@@ -499,7 +477,7 @@ function TrackRowComponent({
} }
}, },
className: cn( className: cn(
"group relative w-full cursor-pointer text-left text-sm transition-colors select-none", "group relative w-full cursor-pointer select-none text-left text-sm transition-colors",
flush ? "py-2" : "py-2.5", flush ? "py-2" : "py-2.5",
inRange && "text-primary-foreground", inRange && "text-primary-foreground",
isDragging && "opacity-50" isDragging && "opacity-50"
+2 -8
View File
@@ -48,14 +48,8 @@ function AccordionTrigger({
{...props} {...props}
> >
{children} {children}
<ChevronDownIcon <ChevronDownIcon data-slot="accordion-trigger-icon" className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden" />
data-slot="accordion-trigger-icon" <ChevronUpIcon data-slot="accordion-trigger-icon" className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline" />
className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
/>
<ChevronUpIcon
data-slot="accordion-trigger-icon"
className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
/>
</AccordionPrimitive.Trigger> </AccordionPrimitive.Trigger>
</AccordionPrimitive.Header> </AccordionPrimitive.Header>
) )
+5 -2
View File
@@ -82,7 +82,9 @@ function BreadcrumbSeparator({
className={cn("[&>svg]:size-3.5", className)} className={cn("[&>svg]:size-3.5", className)}
{...props} {...props}
> >
{children ?? <ChevronRightIcon />} {children ?? (
<ChevronRightIcon />
)}
</li> </li>
) )
} }
@@ -102,7 +104,8 @@ function BreadcrumbEllipsis({
)} )}
{...props} {...props}
> >
<MoreHorizontalIcon /> <MoreHorizontalIcon
/>
<span className="sr-only">More</span> <span className="sr-only">More</span>
</span> </span>
) )
+2 -9
View File
@@ -10,11 +10,7 @@ import {
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Button, buttonVariants } from "@/components/ui/button" import { Button, buttonVariants } from "@/components/ui/button"
import { import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "lucide-react"
ChevronLeftIcon,
ChevronRightIcon,
ChevronDownIcon,
} from "lucide-react"
function Calendar({ function Calendar({
className, className,
@@ -157,10 +153,7 @@ function Calendar({
if (orientation === "right") { if (orientation === "right") {
return ( return (
<ChevronRightIcon <ChevronRightIcon className={cn("size-4", className)} {...props} />
className={cn("size-4", className)}
{...props}
/>
) )
} }
+2 -1
View File
@@ -23,7 +23,8 @@ function Checkbox({
data-slot="checkbox-indicator" data-slot="checkbox-indicator"
className="grid place-content-center text-current transition-none [&>svg]:size-3.5" className="grid place-content-center text-current transition-none [&>svg]:size-3.5"
> >
<CheckIcon /> <CheckIcon
/>
</CheckboxPrimitive.Indicator> </CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root> </CheckboxPrimitive.Root>
) )
+1 -4
View File
@@ -112,10 +112,7 @@ function ComboboxContent({
<ComboboxPrimitive.Popup <ComboboxPrimitive.Popup
data-slot="combobox-content" data-slot="combobox-content"
data-chips={!!anchor} data-chips={!!anchor}
className={cn( className={cn("group/combobox-content max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) overflow-hidden rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
"group/combobox-content relative max-h-(--available-height) w-(--anchor-width) max-w-(--available-width) min-w-[calc(var(--anchor-width)+--spacing(7))] origin-(--transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[chips=true]:min-w-(--anchor-width) data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-left-2 data-[side=inline-start]:slide-in-from-right-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! *:data-[slot=input-group]:m-1 *:data-[slot=input-group]:mb-0 *:data-[slot=input-group]:h-8 *:data-[slot=input-group]:border-input/30 *:data-[slot=input-group]:bg-input/30 *:data-[slot=input-group]:shadow-none **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
</ComboboxPrimitive.Positioner> </ComboboxPrimitive.Positioner>
+4 -1
View File
@@ -11,7 +11,10 @@ import {
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
} from "@/components/ui/dialog" } from "@/components/ui/dialog"
import { InputGroup, InputGroupAddon } from "@/components/ui/input-group" import {
InputGroup,
InputGroupAddon,
} from "@/components/ui/input-group"
import { SearchIcon, CheckIcon } from "lucide-react" import { SearchIcon, CheckIcon } from "lucide-react"
function Command({ function Command({
+6 -10
View File
@@ -68,10 +68,7 @@ function ContextMenuContent({
<ContextMenuPrimitive.Portal> <ContextMenuPrimitive.Portal>
<ContextMenuPrimitive.Content <ContextMenuPrimitive.Content
data-slot="context-menu-content" data-slot="context-menu-content"
className={cn( className={cn("z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
"relative z-50 max-h-(--radix-context-menu-content-available-height) min-w-36 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
</ContextMenuPrimitive.Portal> </ContextMenuPrimitive.Portal>
@@ -132,10 +129,7 @@ function ContextMenuSubContent({
return ( return (
<ContextMenuPrimitive.SubContent <ContextMenuPrimitive.SubContent
data-slot="context-menu-sub-content" data-slot="context-menu-sub-content"
className={cn( className={cn("z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) overflow-hidden rounded-lg border p-1 text-popover-foreground shadow-lg duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
"relative z-50 min-w-32 origin-(--radix-context-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg border bg-popover/70 p-1 text-popover-foreground shadow-lg duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
) )
@@ -163,7 +157,8 @@ function ContextMenuCheckboxItem({
> >
<span className="pointer-events-none absolute right-2"> <span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator> <ContextMenuPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</ContextMenuPrimitive.ItemIndicator> </ContextMenuPrimitive.ItemIndicator>
</span> </span>
{children} {children}
@@ -191,7 +186,8 @@ function ContextMenuRadioItem({
> >
<span className="pointer-events-none absolute right-2"> <span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator> <ContextMenuPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</ContextMenuPrimitive.ItemIndicator> </ContextMenuPrimitive.ItemIndicator>
</span> </span>
{children} {children}
+2 -1
View File
@@ -74,7 +74,8 @@ function DialogContent({
className="absolute top-2 right-2" className="absolute top-2 right-2"
size="icon-sm" size="icon-sm"
> >
<XIcon /> <XIcon
/>
<span className="sr-only">Close</span> <span className="sr-only">Close</span>
</Button> </Button>
</DialogPrimitive.Close> </DialogPrimitive.Close>
+6 -10
View File
@@ -43,10 +43,7 @@ function DropdownMenuContent({
data-slot="dropdown-menu-content" data-slot="dropdown-menu-content"
sideOffset={sideOffset} sideOffset={sideOffset}
align={align} align={align}
className={cn( className={cn("z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
"relative z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
</DropdownMenuPrimitive.Portal> </DropdownMenuPrimitive.Portal>
@@ -109,7 +106,8 @@ function DropdownMenuCheckboxItem({
data-slot="dropdown-menu-checkbox-item-indicator" data-slot="dropdown-menu-checkbox-item-indicator"
> >
<DropdownMenuPrimitive.ItemIndicator> <DropdownMenuPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</DropdownMenuPrimitive.ItemIndicator> </DropdownMenuPrimitive.ItemIndicator>
</span> </span>
{children} {children}
@@ -151,7 +149,8 @@ function DropdownMenuRadioItem({
data-slot="dropdown-menu-radio-item-indicator" data-slot="dropdown-menu-radio-item-indicator"
> >
<DropdownMenuPrimitive.ItemIndicator> <DropdownMenuPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</DropdownMenuPrimitive.ItemIndicator> </DropdownMenuPrimitive.ItemIndicator>
</span> </span>
{children} {children}
@@ -245,10 +244,7 @@ function DropdownMenuSubContent({
return ( return (
<DropdownMenuPrimitive.SubContent <DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content" data-slot="dropdown-menu-sub-content"
className={cn( className={cn("z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10!", className )}
"relative z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:not-data-[variant=destructive]:focus:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:bg-foreground/10 **:data-[slot$=-item]:not-data-[variant=destructive]:data-highlighted:**:text-accent-foreground **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
) )
+2 -1
View File
@@ -78,7 +78,8 @@ function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) {
role="separator" role="separator"
{...props} {...props}
> >
<MinusIcon /> <MinusIcon
/>
</div> </div>
) )
} }
+6 -10
View File
@@ -78,10 +78,7 @@ function MenubarContent({
align={align} align={align}
alignOffset={alignOffset} alignOffset={alignOffset}
sideOffset={sideOffset} sideOffset={sideOffset}
className={cn( className={cn("z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
"relative z-50 min-w-36 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95",
className
)}
{...props} {...props}
/> />
</MenubarPortal> </MenubarPortal>
@@ -133,7 +130,8 @@ function MenubarCheckboxItem({
> >
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4"> <span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
<MenubarPrimitive.ItemIndicator> <MenubarPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</MenubarPrimitive.ItemIndicator> </MenubarPrimitive.ItemIndicator>
</span> </span>
{children} {children}
@@ -161,7 +159,8 @@ function MenubarRadioItem({
> >
<span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4"> <span className="pointer-events-none absolute left-1.5 flex size-4 items-center justify-center [&_svg:not([class*='size-'])]:size-4">
<MenubarPrimitive.ItemIndicator> <MenubarPrimitive.ItemIndicator>
<CheckIcon /> <CheckIcon
/>
</MenubarPrimitive.ItemIndicator> </MenubarPrimitive.ItemIndicator>
</span> </span>
{children} {children}
@@ -255,10 +254,7 @@ function MenubarSubContent({
return ( return (
<MenubarPrimitive.SubContent <MenubarPrimitive.SubContent
data-slot="menubar-sub-content" data-slot="menubar-sub-content"
className={cn( className={cn("z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) overflow-hidden rounded-lg p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", className )}
"relative z-50 min-w-32 origin-(--radix-menubar-content-transform-origin) animate-none! overflow-hidden rounded-lg bg-popover/70 p-1 text-popover-foreground shadow-lg ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
className
)}
{...props} {...props}
/> />
) )
+1 -5
View File
@@ -27,11 +27,7 @@ function NativeSelect({
className="h-8 w-full min-w-0 appearance-none rounded-lg border border-input bg-transparent py-1 pr-8 pl-2.5 text-sm transition-colors outline-none select-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-[size=sm]:py-0.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40" className="h-8 w-full min-w-0 appearance-none rounded-lg border border-input bg-transparent py-1 pr-8 pl-2.5 text-sm transition-colors outline-none select-none selection:bg-primary selection:text-primary-foreground placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 disabled:pointer-events-none disabled:cursor-not-allowed aria-invalid:border-destructive aria-invalid:ring-3 aria-invalid:ring-destructive/20 data-[size=sm]:h-7 data-[size=sm]:rounded-[min(var(--radius-md),10px)] data-[size=sm]:py-0.5 dark:bg-input/30 dark:hover:bg-input/50 dark:aria-invalid:border-destructive/50 dark:aria-invalid:ring-destructive/40"
{...props} {...props}
/> />
<ChevronDownIcon <ChevronDownIcon className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none" aria-hidden="true" data-slot="native-select-icon" />
className="pointer-events-none absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-muted-foreground select-none"
aria-hidden="true"
data-slot="native-select-icon"
/>
</div> </div>
) )
} }
+1 -4
View File
@@ -74,10 +74,7 @@ function NavigationMenuTrigger({
{...props} {...props}
> >
{children}{" "} {children}{" "}
<ChevronDownIcon <ChevronDownIcon className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180" aria-hidden="true" />
className="relative top-px ml-1 size-3 transition duration-300 group-data-popup-open/navigation-menu-trigger:rotate-180 group-data-open/navigation-menu-trigger:rotate-180"
aria-hidden="true"
/>
</NavigationMenuPrimitive.Trigger> </NavigationMenuPrimitive.Trigger>
) )
} }
+3 -6
View File
@@ -2,11 +2,7 @@ import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
ChevronLeftIcon,
ChevronRightIcon,
MoreHorizontalIcon,
} from "lucide-react"
function Pagination({ className, ...props }: React.ComponentProps<"nav">) { function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
return ( return (
@@ -115,7 +111,8 @@ function PaginationEllipsis({
)} )}
{...props} {...props}
> >
<MoreHorizontalIcon /> <MoreHorizontalIcon
/>
<span className="sr-only">More pages</span> <span className="sr-only">More pages</span>
</span> </span>
) )
+5 -8
View File
@@ -69,12 +69,7 @@ function SelectContent({
<SelectPrimitive.Content <SelectPrimitive.Content
data-slot="select-content" data-slot="select-content"
data-align-trigger={position === "item-aligned"} data-align-trigger={position === "item-aligned"}
className={cn( className={cn("z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 animate-none! relative bg-popover/70 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:focus:bg-foreground/10! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:**:text-accent-foreground!", position ==="popper"&&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1", className )}
"relative z-50 max-h-(--radix-select-content-available-height) min-w-36 origin-(--radix-select-content-transform-origin) animate-none! overflow-x-hidden overflow-y-auto rounded-lg bg-popover/70 text-popover-foreground shadow-md ring-1 ring-foreground/10 duration-100 before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:rounded-[inherit] before:backdrop-blur-2xl before:backdrop-saturate-150 data-[align-trigger=true]:animate-none data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 **:data-[slot$=-item]:focus:bg-foreground/10 **:data-[slot$=-item]:data-highlighted:bg-foreground/10 **:data-[slot$=-separator]:bg-foreground/5 **:data-[slot$=-trigger]:focus:bg-foreground/10 **:data-[slot$=-trigger]:aria-expanded:bg-foreground/10! **:data-[variant=destructive]:**:text-accent-foreground! **:data-[variant=destructive]:text-accent-foreground! **:data-[variant=destructive]:focus:bg-foreground/10! data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
className
)}
position={position} position={position}
align={align} align={align}
{...props} {...props}
@@ -158,7 +153,8 @@ function SelectScrollUpButton({
)} )}
{...props} {...props}
> >
<ChevronUpIcon /> <ChevronUpIcon
/>
</SelectPrimitive.ScrollUpButton> </SelectPrimitive.ScrollUpButton>
) )
} }
@@ -176,7 +172,8 @@ function SelectScrollDownButton({
)} )}
{...props} {...props}
> >
<ChevronDownIcon /> <ChevronDownIcon
/>
</SelectPrimitive.ScrollDownButton> </SelectPrimitive.ScrollDownButton>
) )
} }
+2 -1
View File
@@ -75,7 +75,8 @@ function SheetContent({
className="absolute top-3 right-3" className="absolute top-3 right-3"
size="icon-sm" size="icon-sm"
> >
<XIcon /> <XIcon
/>
<span className="sr-only">Close</span> <span className="sr-only">Close</span>
</Button> </Button>
</SheetPrimitive.Close> </SheetPrimitive.Close>
+16 -12
View File
@@ -2,13 +2,7 @@
import { useTheme } from "next-themes" import { useTheme } from "next-themes"
import { Toaster as Sonner, type ToasterProps } from "sonner" import { Toaster as Sonner, type ToasterProps } from "sonner"
import { import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
CircleCheckIcon,
InfoIcon,
TriangleAlertIcon,
OctagonXIcon,
Loader2Icon,
} from "lucide-react"
const Toaster = ({ ...props }: ToasterProps) => { const Toaster = ({ ...props }: ToasterProps) => {
const { theme = "system" } = useTheme() const { theme = "system" } = useTheme()
@@ -19,11 +13,21 @@ const Toaster = ({ ...props }: ToasterProps) => {
theme={theme as ToasterProps["theme"]} theme={theme as ToasterProps["theme"]}
className="toaster group" className="toaster group"
icons={{ icons={{
success: <CircleCheckIcon className="size-4" />, success: (
info: <InfoIcon className="size-4" />, <CircleCheckIcon className="size-4" />
warning: <TriangleAlertIcon className="size-4" />, ),
error: <OctagonXIcon className="size-4" />, info: (
loading: <Loader2Icon className="size-4 animate-spin" />, <InfoIcon className="size-4" />
),
warning: (
<TriangleAlertIcon className="size-4" />
),
error: (
<OctagonXIcon className="size-4" />
),
loading: (
<Loader2Icon className="size-4 animate-spin" />
),
}} }}
style={ style={
{ {
+1 -6
View File
@@ -3,12 +3,7 @@ import { Loader2Icon } from "lucide-react"
function Spinner({ className, ...props }: React.ComponentProps<"svg">) { function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
return ( return (
<Loader2Icon <Loader2Icon role="status" aria-label="Loading" className={cn("size-4 animate-spin", className)} {...props} />
role="status"
aria-label="Loading"
className={cn("size-4 animate-spin", className)}
{...props}
/>
) )
} }
+3 -10
View File
@@ -64,18 +64,12 @@ export function useMediaActions() {
api.playlists.getOrderedArtistSongIds, api.playlists.getOrderedArtistSongIds,
{ artistId: artistId as Id<"artists"> } { artistId: artistId as Id<"artists"> }
) )
void runQueueAction(action, songIds.flat()) void runQueueAction(action, songIds)
break break
} }
} }
}, },
[ [convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
convex,
cacheScope,
toggleArtistFavorite,
openAddArtistToPlaylist,
runQueueAction,
]
) )
return { runSongsAction, runArtistAction } return { runSongsAction, runArtistAction }
@@ -99,8 +93,7 @@ export function useTrackListMediaAction({
return React.useCallback( return React.useCallback(
(action: MediaContextAction, songId: string) => { (action: MediaContextAction, songId: string) => {
const targetIds = const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const stationArtist = const stationArtist =
artistId ?? artistId ??
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined) (songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
+14 -4
View File
@@ -3,7 +3,10 @@
import * as React from "react" import * as React from "react"
import type { BrowseSong } from "@otunes/convex/types" import type { BrowseSong } from "@otunes/convex/types"
import { albumCoverUrl, type CoverImageSize } from "@/lib/cover-urls" import {
albumCoverUrl,
type CoverImageSize,
} from "@/lib/cover-urls"
const MEDIA_SESSION_ACTIONS = [ const MEDIA_SESSION_ACTIONS = [
"play", "play",
@@ -14,7 +17,12 @@ const MEDIA_SESSION_ACTIONS = [
] as const ] as const
const MEDIA_SESSION_ARTWORK_SIZES = [ const MEDIA_SESSION_ARTWORK_SIZES = [
64, 128, 192, 256, 384, 512, 64,
128,
192,
256,
384,
512,
] as const satisfies readonly CoverImageSize[] ] as const satisfies readonly CoverImageSize[]
function mediaSessionSupported() { function mediaSessionSupported() {
@@ -34,8 +42,10 @@ function setActionHandler(
function artworkForSong(song: BrowseSong): MediaImage[] { function artworkForSong(song: BrowseSong): MediaImage[] {
return MEDIA_SESSION_ARTWORK_SIZES.map((size) => ({ return MEDIA_SESSION_ARTWORK_SIZES.map((size) => ({
src: new URL(albumCoverUrl(song.album.id, size), window.location.origin) src: new URL(
.href, albumCoverUrl(song.album.id, size),
window.location.origin
).href,
sizes: `${size}x${size}`, sizes: `${size}x${size}`,
})) }))
} }
+5 -5
View File
@@ -7,7 +7,10 @@ export function getContiguousSelectedIndices(
.map((item, index) => (selectedIds.has(item.selectionId) ? index : -1)) .map((item, index) => (selectedIds.has(item.selectionId) ? index : -1))
.filter((index) => index >= 0) .filter((index) => index >= 0)
if (selectedIndices.length > 1 && selectedIndices.includes(dragIndex)) { if (
selectedIndices.length > 1 &&
selectedIndices.includes(dragIndex)
) {
return selectedIndices return selectedIndices
} }
@@ -34,10 +37,7 @@ export function moveQueueBlock<T>(
} }
const removedBefore = sorted.filter((index) => index < targetIndex).length const removedBefore = sorted.filter((index) => index < targetIndex).length
const insertAt = Math.max( const insertAt = Math.max(0, Math.min(targetIndex - removedBefore, remaining.length))
0,
Math.min(targetIndex - removedBefore, remaining.length)
)
const next = [...remaining] const next = [...remaining]
next.splice(insertAt, 0, ...block) next.splice(insertAt, 0, ...block)
+1 -6
View File
@@ -36,12 +36,7 @@ export function resizeProfileImageToDataUrl(file: File): Promise<string> {
file.type === "image/png" || file.type === "image/webp" file.type === "image/png" || file.type === "image/webp"
? "image/png" ? "image/png"
: "image/jpeg" : "image/jpeg"
resolve( resolve(canvas.toDataURL(outputType, outputType === "image/jpeg" ? 0.9 : undefined))
canvas.toDataURL(
outputType,
outputType === "image/jpeg" ? 0.9 : undefined
)
)
} }
image.onerror = () => { image.onerror = () => {
+8 -12
View File
@@ -1,7 +1,11 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
export type SelectionRangePosition = export type SelectionRangePosition =
"none" | "only" | "start" | "middle" | "end" | "none"
| "only"
| "start"
| "middle"
| "end"
export function getSelectionRangePositions( export function getSelectionRangePositions(
itemIds: string[], itemIds: string[],
@@ -96,28 +100,20 @@ export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) {
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100", "pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
flush flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)} )}
/> />
) )
} }
/** Background for the active (focused or now playing) row. */ /** Background for the active (focused or now playing) row. */
export function TrackRowActiveHighlight({ export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) {
flush = false,
}: {
flush?: boolean
}) {
return ( return (
<div <div
aria-hidden aria-hidden
className={cn( className={cn(
"pointer-events-none bg-muted/60", "pointer-events-none bg-muted/60",
flush flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)} )}
/> />
) )
+2 -1
View File
@@ -8,7 +8,8 @@ export const PLACEHOLDER_PATH = path.join(
) )
const COVER_IMAGE_SIZES = new Set([64, 128, 192, 256, 384, 512, 768, 1024]) const COVER_IMAGE_SIZES = new Set([64, 128, 192, 256, 384, 512, 768, 1024])
const COVER_CACHE_CONTROL = "public, max-age=300, stale-while-revalidate=86400" const COVER_CACHE_CONTROL =
"public, max-age=300, stale-while-revalidate=86400"
const MIME_TYPES: Record<string, string> = { const MIME_TYPES: Record<string, string> = {
".jpg": "image/jpeg", ".jpg": "image/jpeg",
+4 -1
View File
@@ -16,7 +16,10 @@ export type ByteRange = {
*/ */
function toWebStream( function toWebStream(
source: Readable, source: Readable,
{ cancel, finish }: { cancel: () => void; finish?: () => Promise<void> } {
cancel,
finish,
}: { cancel: () => void; finish?: () => Promise<void> }
): ReadableStream<Uint8Array> { ): ReadableStream<Uint8Array> {
let done = false let done = false
+1 -2
View File
@@ -34,8 +34,7 @@ export function cacheDir(kind: "hls" | "lossless") {
function maxCacheBytes() { function maxCacheBytes() {
const configured = Number(process.env.OTUNES_CACHE_MAX_MB) const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
const mb = const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
return mb * 1024 * 1024 return mb * 1024 * 1024
} }
+8 -12
View File
@@ -63,7 +63,11 @@ function hlsLookupKey(
return `${songId}:${quality ?? ""}:${preferAtmos ? "1" : "0"}` return `${songId}:${quality ?? ""}:${preferAtmos ? "1" : "0"}`
} }
async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) { async function hlsJobKey(
song: SongSource,
sourcePath: string,
kbps: number
) {
const stat = await fs.stat(sourcePath) const stat = await fs.stat(sourcePath)
return crypto return crypto
.createHash("sha256") .createHash("sha256")
@@ -80,10 +84,7 @@ async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) {
} }
export function hlsSegmentPath(job: HlsJob, segmentIndex: number) { export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
return path.join( return path.join(job.dir, `segment_${segmentIndex.toString().padStart(5, "0")}.ts`)
job.dir,
`segment_${segmentIndex.toString().padStart(5, "0")}.ts`
)
} }
async function touchHlsJob(job: HlsJob) { async function touchHlsJob(job: HlsJob) {
@@ -131,9 +132,7 @@ export function getExistingHlsJob(
quality: string | null, quality: string | null,
preferAtmos: boolean preferAtmos: boolean
) { ) {
return ( return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
)
} }
export async function waitForHlsSegment( export async function waitForHlsSegment(
@@ -221,10 +220,7 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
if (code === 0) { if (code === 0) {
void pruneCache() void pruneCache()
} else { } else {
console.error( console.error(`ffmpeg HLS exited with code ${code}`, ffmpeg.stderrTail())
`ffmpeg HLS exited with code ${code}`,
ffmpeg.stderrTail()
)
} }
}, },
() => { () => {
+1 -3
View File
@@ -59,9 +59,7 @@ async function convert(source: string, key: string): Promise<string> {
]) ])
const code = await ffmpeg.exited const code = await ffmpeg.exited
if (code !== 0) { if (code !== 0) {
throw new Error( throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`)
`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`
)
} }
await fs.rename(temporary, output) await fs.rename(temporary, output)
} finally { } finally {
+40 -31
View File
@@ -1,54 +1,63 @@
import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser" import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser"
import type { import type { FunctionArgs, FunctionReference } from "convex/server"
FunctionArgs,
FunctionReference,
FunctionReturnType,
} from "convex/server"
import { api } from "../convex/_generated/api" import { api } from "../convex/_generated/api"
import { chunk } from "../convex/limits" import type { Id } from "../convex/_generated/dataModel"
type UserFavorites = FunctionReturnType<typeof api.favorites.getUserFavorites> type FavoriteIds = {
type FavoriteList = keyof UserFavorites favoriteSongs: Id<"songs">[]
favoriteAlbums: Id<"albums">[]
favoriteArtists: Id<"artists">[]
}
/** Rewrites one list of the cached `getUserFavorites` result, if loaded. */ type FavoriteList = keyof FavoriteIds
function patchFavorites(
function patchFavorites<List extends FavoriteList>(
store: OptimisticLocalStore, store: OptimisticLocalStore,
list: FavoriteList, list: List,
update: (ids: string[]) => string[] update: (ids: FavoriteIds[List]) => FavoriteIds[List]
) { ) {
const current = store.getQuery(api.favorites.getUserFavorites, {}) const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return if (!current) return
const ids: string[] = current[list].flat() const next = update(current[list])
const next = update(ids) if (next !== current[list]) {
if (next !== ids) { store.setQuery(
// `next` only holds ids of this list's kind, which TS cannot follow here. api.favorites.getUserFavorites,
store.setQuery(api.favorites.getUserFavorites, {}, { {},
...current, {
[list]: chunk(next), ...current,
} as UserFavorites) [list]: next,
}
)
} }
} }
function addFavorites( function addFavorites<List extends FavoriteList>(
store: OptimisticLocalStore, store: OptimisticLocalStore,
list: FavoriteList, list: List,
ids: string[] ids: FavoriteIds[List]
) { ) {
patchFavorites(store, list, (current) => { patchFavorites(store, list, (current) => {
const added = ids.filter((id) => !current.includes(id)) const added = ids.filter((id) => !(current as string[]).includes(id))
return added.length === 0 ? current : [...new Set([...current, ...added])] return added.length === 0
? current
: ([...new Set([...current, ...added])] as FavoriteIds[List])
}) })
} }
function removeFavorites( function removeFavorites<List extends FavoriteList>(
store: OptimisticLocalStore, store: OptimisticLocalStore,
list: FavoriteList, list: List,
ids: string[] ids: FavoriteIds[List]
) { ) {
const removed = new Set(ids) const removed = new Set<string>(ids)
patchFavorites(store, list, (current) => patchFavorites(
current.filter((id) => !removed.has(id)) store,
list,
(current) =>
(current as string[]).filter(
(id) => !removed.has(id)
) as FavoriteIds[List]
) )
} }
-2
View File
@@ -11,7 +11,6 @@
import type * as actions from "../actions.js"; import type * as actions from "../actions.js";
import type * as auth from "../auth.js"; import type * as auth from "../auth.js";
import type * as crons from "../crons.js"; import type * as crons from "../crons.js";
import type * as favoriteStore from "../favoriteStore.js";
import type * as favorites from "../favorites.js"; import type * as favorites from "../favorites.js";
import type * as http from "../http.js"; import type * as http from "../http.js";
import type * as intentCatalog from "../intentCatalog.js"; import type * as intentCatalog from "../intentCatalog.js";
@@ -35,7 +34,6 @@ declare const fullApi: ApiFromModules<{
actions: typeof actions; actions: typeof actions;
auth: typeof auth; auth: typeof auth;
crons: typeof crons; crons: typeof crons;
favoriteStore: typeof favoriteStore;
favorites: typeof favorites; favorites: typeof favorites;
http: typeof http; http: typeof http;
intentCatalog: typeof intentCatalog; intentCatalog: typeof intentCatalog;
@@ -29,7 +29,7 @@ function playlistMutation() {
mutation: (definition) => definition, mutation: (definition) => definition,
query: (definition) => definition, query: (definition) => definition,
} }
if (name === "./library" || name === "./limits") return {} if (name === "./library") return {}
throw new Error(`Unexpected import ${name}`) throw new Error(`Unexpected import ${name}`)
}, },
}) })
+1 -1
View File
@@ -5,4 +5,4 @@ export default {
applicationID: "convex", applicationID: "convex",
}, },
], ],
} };
-274
View File
@@ -1,274 +0,0 @@
import type { WithoutSystemFields } from "convex/server"
import { ConvexError, v } from "convex/values"
import { internal } from "./_generated/api"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server"
import { internalMutation } from "./_generated/server"
import { chunk, type Chunked } from "./limits"
export type FavoriteKind = Doc<"favorites">["kind"]
type FavoriteEntityId = {
[Kind in FavoriteKind]: Extract<Doc<"favorites">, { kind: Kind }>["entityId"]
}
/** A user's favorites, each list oldest first. */
export type FavoriteIds = {
favoriteSongs: Id<"songs">[]
favoriteAlbums: Id<"albums">[]
favoriteArtists: Id<"artists">[]
}
/** `FavoriteIds` as `favorites.getUserFavorites` returns it. */
export type FavoriteIdChunks = {
[List in keyof FavoriteIds]: Chunked<FavoriteIds[List][number]>
}
function legacyFavorites(user: Doc<"users"> | null): FavoriteIds {
return {
favoriteSongs: user?.favoriteSongs ?? [],
favoriteAlbums: user?.favoriteAlbums ?? [],
favoriteArtists: user?.favoriteArtists ?? [],
}
}
export function hasLegacyFavorites(user: Doc<"users">) {
return (
user.favoriteSongs !== undefined ||
user.favoriteAlbums !== undefined ||
user.favoriteArtists !== undefined
)
}
/** Favorited ids of one kind, oldest first. */
async function readKind<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind
): Promise<FavoriteEntityId[Kind][]> {
const rows = await ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) => q.eq("userId", userId).eq("kind", kind))
.collect()
return rows.map((row) => row.entityId as FavoriteEntityId[Kind])
}
/**
* Reads every favorite, oldest first. Users without rows fall back to the
* legacy arrays on `users` until `migrations.migrateUsers` moves them, so
* migrated users never read (or rerun on) their user doc here.
*/
export async function readFavorites(
ctx: QueryCtx,
userId: Id<"users">
): Promise<FavoriteIds> {
const [favoriteSongs, favoriteAlbums, favoriteArtists] = await Promise.all([
readKind(ctx, userId, "song"),
readKind(ctx, userId, "album"),
readKind(ctx, userId, "artist"),
])
if (
favoriteSongs.length > 0 ||
favoriteAlbums.length > 0 ||
favoriteArtists.length > 0
) {
return { favoriteSongs, favoriteAlbums, favoriteArtists }
}
return legacyFavorites(await ctx.db.get(userId))
}
/**
* Above this many ids, one scan of the user's list beats a lookup per id, and
* keeps bulk writes under Convex's 4,096 reads per function.
*/
const MAX_POINT_LOOKUPS = 64
/** Maps each of `ids` the user has favorited to its row. */
async function favoriteRows<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind,
ids: ReadonlySet<FavoriteEntityId[Kind]>
): Promise<Map<string, Id<"favorites">>> {
const rows =
ids.size <= MAX_POINT_LOOKUPS
? await Promise.all(
[...ids].map((entityId) =>
ctx.db
.query("favorites")
.withIndex("by_user_entity", (q) =>
q.eq("userId", userId).eq("entityId", entityId)
)
.unique()
)
)
: await ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) =>
q.eq("userId", userId).eq("kind", kind)
)
.collect()
return new Map(
rows.flatMap((row) =>
row && ids.has(row.entityId as FavoriteEntityId[Kind])
? [[row.entityId, row._id] as const]
: []
)
)
}
/** True when `ids` is non-empty and the user has favorited every one. */
export async function allFavorited<Kind extends FavoriteKind>(
ctx: QueryCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const unique = new Set(ids)
if (unique.size === 0) {
return false
}
const rows = await favoriteRows(ctx, userId, kind, unique)
return rows.size === unique.size
}
/** Appends ids that are not favorited yet, keeping existing ones in place. */
export async function addFavorites<Kind extends FavoriteKind>(
ctx: MutationCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const unique = new Set(ids)
const existing = await favoriteRows(ctx, userId, kind, unique)
for (const entityId of unique) {
if (!existing.has(entityId)) {
// TS cannot tie a generic `kind` to its `entityId` union member.
await ctx.db.insert("favorites", {
userId,
kind,
entityId,
} as WithoutSystemFields<Doc<"favorites">>)
}
}
}
export async function removeFavorites<Kind extends FavoriteKind>(
ctx: MutationCtx,
userId: Id<"users">,
kind: Kind,
ids: FavoriteEntityId[Kind][]
) {
const rows = await favoriteRows(ctx, userId, kind, new Set(ids))
await deleteFavoriteRows(ctx, [...rows.values()])
}
/**
* Rows one call deletes before scheduling the rest. Convex counts each delete
* as a read, so unfavoriting a huge artist cannot happen in one mutation.
*/
const MAX_INLINE_DELETES = 1_000
async function deleteFavoriteRows(ctx: MutationCtx, rowIds: Id<"favorites">[]) {
for (const rowId of rowIds.slice(0, MAX_INLINE_DELETES)) {
await ctx.db.delete(rowId)
}
for (const rest of chunk(rowIds.slice(MAX_INLINE_DELETES))) {
await ctx.scheduler.runAfter(0, internal.favoriteStore.deleteRows, {
rowIds: rest,
})
}
}
/** Finishes deletes `deleteFavoriteRows` could not fit in one mutation. */
export const deleteRows = internalMutation({
args: { rowIds: v.array(v.id("favorites")) },
handler: async (ctx, { rowIds }) => {
// Rows can disappear in between, e.g. when the scanner purges a song.
for (const rowId of rowIds.slice(0, MAX_INLINE_DELETES)) {
if (await ctx.db.get(rowId)) {
await ctx.db.delete(rowId)
}
}
const rest = rowIds.slice(MAX_INLINE_DELETES)
if (rest.length > 0) {
await ctx.scheduler.runAfter(0, internal.favoriteStore.deleteRows, {
rowIds: rest,
})
}
},
})
/**
* Moves a user's legacy favorite arrays into `favorites` rows, keeping their
* order, then clears them. Safe to call repeatedly.
*/
export async function migrateUserFavorites(
ctx: MutationCtx,
user: Doc<"users">
) {
if (!hasLegacyFavorites(user)) {
return
}
const legacy = legacyFavorites(user)
await addFavorites(ctx, user._id, "song", legacy.favoriteSongs)
await addFavorites(ctx, user._id, "album", legacy.favoriteAlbums)
await addFavorites(ctx, user._id, "artist", legacy.favoriteArtists)
await ctx.db.patch(user._id, {
favoriteSongs: undefined,
favoriteAlbums: undefined,
favoriteArtists: undefined,
})
}
/**
* Called before every favorites write, so a user toggling a favorite before
* the boot migration reaches them does not end up with half their favorites
* in rows and half on `users`.
*/
export async function requireMigratedFavorites(
ctx: MutationCtx,
userId: Id<"users">
) {
const user = await ctx.db.get(userId)
if (!user) {
throw new ConvexError("User not found")
}
await migrateUserFavorites(ctx, user)
}
/** Removes deleted songs, albums or artists from every user's favorites. */
export async function purgeFavoriteEntities(
ctx: MutationCtx,
ids: Iterable<FavoriteEntityId[FavoriteKind]>
) {
for (const entityId of ids) {
const rows = await ctx.db
.query("favorites")
.withIndex("by_entity", (q) => q.eq("entityId", entityId))
.collect()
for (const row of rows) {
await ctx.db.delete(row._id)
}
}
}
export async function deleteUserFavorites(
ctx: MutationCtx,
userId: Id<"users">
) {
const rows = await Promise.all(
(["song", "album", "artist"] as const).map((kind) =>
ctx.db
.query("favorites")
.withIndex("by_user_kind", (q) =>
q.eq("userId", userId).eq("kind", kind)
)
.collect()
)
)
await deleteFavoriteRows(
ctx,
rows.flat().map((row) => row._id)
)
}
+246 -114
View File
@@ -3,26 +3,18 @@ import { ConvexError, v } from "convex/values"
import type { Doc, Id } from "./_generated/dataModel" import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server" import type { MutationCtx, QueryCtx } from "./_generated/server"
import { mutation, query } from "./_generated/server" import { mutation, query } from "./_generated/server"
import { import type { BrowsePlaylistDetail, BrowsePlaylistSummary } from "./library"
addFavorites,
allFavorited,
readFavorites,
removeFavorites,
requireMigratedFavorites,
type FavoriteIdChunks,
} from "./favoriteStore"
import type { BrowsePlaylistSummary } from "./library"
import { browseSongsFromIds } from "./library" import { browseSongsFromIds } from "./library"
import { chunk } from "./limits"
import type { BrowseFavoritesDetail } from "./types"
/** Resolves the signed-in user and moves any legacy favorites into rows. */ function uniqueIds<T extends string>(ids: T[]): T[] {
async function requireFavoritesUser(ctx: MutationCtx) { return [...new Set(ids)]
}
async function requireAuth(ctx: MutationCtx) {
const userId = await getAuthUserId(ctx) const userId = await getAuthUserId(ctx)
if (userId === null) { if (userId === null) {
throw new ConvexError("Not authenticated") throw new ConvexError("Not authenticated")
} }
await requireMigratedFavorites(ctx, userId)
return userId return userId
} }
@@ -50,46 +42,112 @@ async function getSongIdsForArtist(ctx: QueryCtx, artistId: Id<"artists">) {
return songs.map((song) => song._id) return songs.map((song) => song._id)
} }
async function promoteArtistIfAllAlbumsFavorited( function allAlbumSongsFavorited(
ctx: MutationCtx, albumSongIds: Id<"songs">[],
userId: Id<"users">, favoriteSongs: Id<"songs">[]
artistId: Id<"artists">
) { ) {
const albumIds = await getAlbumIdsForArtist(ctx, artistId) if (albumSongIds.length === 0) {
if (await allFavorited(ctx, userId, "album", albumIds)) { return false
await addFavorites(ctx, userId, "artist", [artistId])
} }
const favorited = new Set(favoriteSongs)
return albumSongIds.every((id) => favorited.has(id))
}
function allArtistAlbumsFavorited(
artistAlbumIds: Id<"albums">[],
favoriteAlbums: Id<"albums">[]
) {
if (artistAlbumIds.length === 0) {
return false
}
const favorited = new Set(favoriteAlbums)
return artistAlbumIds.every((id) => favorited.has(id))
}
async function promoteAlbumIfAllSongsFavorited(
ctx: MutationCtx,
favoriteSongs: Id<"songs">[],
favoriteAlbums: Id<"albums">[],
albumId: Id<"albums">
) {
const albumSongIds = await getSongIdsForAlbum(ctx, albumId)
if (!allAlbumSongsFavorited(albumSongIds, favoriteSongs)) {
return favoriteAlbums
}
return uniqueIds([...favoriteAlbums, albumId])
}
async function promoteArtistIfAllAlbumsFavorited(
ctx: MutationCtx,
favoriteAlbums: Id<"albums">[],
favoriteArtists: Id<"artists">[],
artistId: Id<"artists">
) {
const artistAlbumIds = await getAlbumIdsForArtist(ctx, artistId)
if (!allArtistAlbumsFavorited(artistAlbumIds, favoriteAlbums)) {
return favoriteArtists
}
return uniqueIds([...favoriteArtists, artistId])
} }
/** Favorites albums whose songs are now all favorited, then their artists. */
async function cascadeUpFromSongs( async function cascadeUpFromSongs(
ctx: MutationCtx, ctx: MutationCtx,
userId: Id<"users">, favoriteSongs: Id<"songs">[],
favoriteAlbums: Id<"albums">[],
favoriteArtists: Id<"artists">[],
songs: Doc<"songs">[] songs: Doc<"songs">[]
) { ) {
for (const albumId of new Set(songs.map((song) => song.album))) { let albums = favoriteAlbums
const songIds = await getSongIdsForAlbum(ctx, albumId) let artists = favoriteArtists
if (await allFavorited(ctx, userId, "song", songIds)) {
await addFavorites(ctx, userId, "album", [albumId]) const albumIds = new Set(songs.map((song) => song.album))
} for (const albumId of albumIds) {
albums = await promoteAlbumIfAllSongsFavorited(
ctx,
favoriteSongs,
albums,
albumId
)
} }
for (const artistId of new Set(songs.map((song) => song.albumArtist))) {
await promoteArtistIfAllAlbumsFavorited(ctx, userId, artistId) const artistIds = new Set(songs.map((song) => song.albumArtist))
for (const artistId of artistIds) {
artists = await promoteArtistIfAllAlbumsFavorited(
ctx,
albums,
artists,
artistId
)
} }
return { favoriteAlbums: albums, favoriteArtists: artists }
} }
export const getUserFavorites = query({ export const getUserFavorites = query({
args: {}, args: {},
handler: async (ctx): Promise<FavoriteIdChunks> => { handler: async (ctx) => {
const userId = await getAuthUserId(ctx) const userId = await getAuthUserId(ctx)
if (userId === null) { if (userId === null) {
return { favoriteSongs: [], favoriteAlbums: [], favoriteArtists: [] } return {
favoriteSongs: [] as Id<"songs">[],
favoriteAlbums: [] as Id<"albums">[],
favoriteArtists: [] as Id<"artists">[],
}
} }
const favorites = await readFavorites(ctx, userId)
const user = await ctx.db.get("users", userId)
if (!user) {
return {
favoriteSongs: [] as Id<"songs">[],
favoriteAlbums: [] as Id<"albums">[],
favoriteArtists: [] as Id<"artists">[],
}
}
return { return {
favoriteSongs: chunk(favorites.favoriteSongs), favoriteSongs: user.favoriteSongs ?? [],
favoriteAlbums: chunk(favorites.favoriteAlbums), favoriteAlbums: user.favoriteAlbums ?? [],
favoriteArtists: chunk(favorites.favoriteArtists), favoriteArtists: user.favoriteArtists ?? [],
} }
}, },
}) })
@@ -107,7 +165,6 @@ async function browseFavoritesSummaryHandler(
return null return null
} }
const { favoriteSongs } = await readFavorites(ctx, userId)
return { return {
id: null, id: null,
isFavorites: true, isFavorites: true,
@@ -119,13 +176,13 @@ async function browseFavoritesSummaryHandler(
cover: null, cover: null,
isOwner: true, isOwner: true,
isSubscribed: false, isSubscribed: false,
songIds: favoriteSongs, songIds: user.favoriteSongs ?? [],
} }
} }
export const browseFavoritesPlaylistDetail = query({ export const browseFavoritesPlaylistDetail = query({
args: {}, args: {},
handler: async (ctx): Promise<BrowseFavoritesDetail | null> => { handler: async (ctx): Promise<BrowsePlaylistDetail | null> => {
const summary = await browseFavoritesSummaryHandler(ctx) const summary = await browseFavoritesSummaryHandler(ctx)
if (!summary) { if (!summary) {
return null return null
@@ -139,7 +196,7 @@ export const browseFavoritesPlaylistDetail = query({
title: summary.title, title: summary.title,
owner: summary.owner, owner: summary.owner,
cover: summary.cover, cover: summary.cover,
songs: chunk(songs), songs,
isOwner: summary.isOwner, isOwner: summary.isOwner,
isSubscribed: summary.isSubscribed, isSubscribed: summary.isSubscribed,
} }
@@ -149,35 +206,69 @@ export const browseFavoritesPlaylistDetail = query({
export const favoriteSong = mutation({ export const favoriteSong = mutation({
args: { songId: v.id("songs") }, args: { songId: v.id("songs") },
handler: async (ctx, { songId }) => { handler: async (ctx, { songId }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const song = await ctx.db.get("songs", songId) const song = await ctx.db.get("songs", songId)
if (!song) { if (!song) {
throw new ConvexError("Song not found") throw new ConvexError("Song not found")
} }
await addFavorites(ctx, userId, "song", [songId]) const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), songId])
await cascadeUpFromSongs(ctx, userId, [song]) const cascaded = await cascadeUpFromSongs(
ctx,
favoriteSongs,
user.favoriteAlbums ?? [],
user.favoriteArtists ?? [],
[song]
)
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums: cascaded.favoriteAlbums,
favoriteArtists: cascaded.favoriteArtists,
})
}, },
}) })
export const favoriteSongs = mutation({ export const favoriteSongs = mutation({
args: { songIds: v.array(v.id("songs")) }, args: { songIds: v.array(v.id("songs")) },
handler: async (ctx, { songIds }) => { handler: async (ctx, { songIds }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const uniqueRequestedIds = uniqueIds(songIds)
const loadedSongs = await Promise.all( const loadedSongs = await Promise.all(
[...new Set(songIds)].map((id) => ctx.db.get("songs", id)) uniqueRequestedIds.map((id) => ctx.db.get("songs", id))
) )
const songs = loadedSongs.filter( const songs = loadedSongs.filter(
(song): song is Doc<"songs"> => song !== null (song): song is Doc<"songs"> => song !== null
) )
const validSongIds = songs.map((song) => song._id)
await addFavorites( const favoriteSongs = uniqueIds([
...(user.favoriteSongs ?? []),
...validSongIds,
])
const cascaded = await cascadeUpFromSongs(
ctx, ctx,
userId, favoriteSongs,
"song", user.favoriteAlbums ?? [],
songs.map((song) => song._id) user.favoriteArtists ?? [],
songs
) )
await cascadeUpFromSongs(ctx, userId, songs)
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums: cascaded.favoriteAlbums,
favoriteArtists: cascaded.favoriteArtists,
})
}, },
}) })
@@ -195,118 +286,159 @@ export const unfavoriteSongs = mutation({
}, },
}) })
/** Unfavorites songs along with their albums and artists. */
async function unfavoriteSongsHandler( async function unfavoriteSongsHandler(
ctx: MutationCtx, ctx: MutationCtx,
songIds: Id<"songs">[] songIds: Id<"songs">[]
) { ) {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const removeSongs = new Set(songIds)
const loadedSongs = await Promise.all( const loadedSongs = await Promise.all(
[...new Set(songIds)].map((songId) => ctx.db.get("songs", songId)) [...removeSongs].map((songId) => ctx.db.get("songs", songId))
) )
const songs = loadedSongs.filter( const removeAlbums = new Set(
(song): song is Doc<"songs"> => song !== null loadedSongs.flatMap((song) => (song ? [song.album] : []))
)
const removeArtists = new Set(
loadedSongs.flatMap((song) => (song ? [song.albumArtist] : []))
) )
await removeFavorites(ctx, userId, "song", songIds) await ctx.db.patch(userId, {
await removeFavorites( favoriteSongs: (user.favoriteSongs ?? []).filter(
ctx, (id) => !removeSongs.has(id)
userId, ),
"album", favoriteAlbums: (user.favoriteAlbums ?? []).filter(
songs.map((song) => song.album) (id) => !removeAlbums.has(id)
) ),
await removeFavorites( favoriteArtists: (user.favoriteArtists ?? []).filter(
ctx, (id) => !removeArtists.has(id)
userId, ),
"artist", })
songs.map((song) => song.albumArtist)
)
} }
export const favoriteAlbum = mutation({ export const favoriteAlbum = mutation({
args: { albumId: v.id("albums") }, args: { albumId: v.id("albums") },
handler: async (ctx, { albumId }) => { handler: async (ctx, { albumId }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const album = await ctx.db.get("albums", albumId) const album = await ctx.db.get("albums", albumId)
if (!album) { if (!album) {
throw new ConvexError("Album not found") throw new ConvexError("Album not found")
} }
await addFavorites(ctx, userId, "album", [albumId]) const songIds = await getSongIdsForAlbum(ctx, albumId)
await addFavorites(
const favoriteAlbums = uniqueIds([...(user.favoriteAlbums ?? []), albumId])
const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), ...songIds])
const favoriteArtists = await promoteArtistIfAllAlbumsFavorited(
ctx, ctx,
userId, favoriteAlbums,
"song", user.favoriteArtists ?? [],
await getSongIdsForAlbum(ctx, albumId) album.artist
) )
await promoteArtistIfAllAlbumsFavorited(ctx, userId, album.artist)
await ctx.db.patch(userId, {
favoriteAlbums,
favoriteSongs,
favoriteArtists,
})
}, },
}) })
/** Unfavorites an album along with its songs and artist. */
export const unfavoriteAlbum = mutation({ export const unfavoriteAlbum = mutation({
args: { albumId: v.id("albums") }, args: { albumId: v.id("albums") },
handler: async (ctx, { albumId }) => { handler: async (ctx, { albumId }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const album = await ctx.db.get("albums", albumId) const album = await ctx.db.get("albums", albumId)
if (!album) { if (!album) {
return return
} }
await removeFavorites(ctx, userId, "album", [albumId]) const albumSongIds = await getSongIdsForAlbum(ctx, albumId)
await removeFavorites(ctx, userId, "artist", [album.artist]) const removeSongs = new Set(albumSongIds)
await removeFavorites(
ctx, const favoriteAlbums = (user.favoriteAlbums ?? []).filter(
userId, (id) => id !== albumId
"song",
await getSongIdsForAlbum(ctx, albumId)
) )
const favoriteSongs = (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
)
let favoriteArtists = user.favoriteArtists ?? []
if (favoriteArtists.includes(album.artist)) {
favoriteArtists = favoriteArtists.filter((id) => id !== album.artist)
}
await ctx.db.patch(userId, {
favoriteSongs,
favoriteAlbums,
favoriteArtists,
})
}, },
}) })
/** Favorites an artist along with all of their albums and songs. */
export const favoriteArtist = mutation({ export const favoriteArtist = mutation({
args: { artistId: v.id("artists") }, args: { artistId: v.id("artists") },
handler: async (ctx, { artistId }) => { handler: async (ctx, { artistId }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const artist = await ctx.db.get("artists", artistId) const artist = await ctx.db.get("artists", artistId)
if (!artist) { if (!artist) {
throw new ConvexError("Artist not found") throw new ConvexError("Artist not found")
} }
await addFavorites(ctx, userId, "artist", [artistId]) const albumIds = await getAlbumIdsForArtist(ctx, artistId)
await addFavorites( const songIds = await getSongIdsForArtist(ctx, artistId)
ctx,
userId, await ctx.db.patch(userId, {
"album", favoriteArtists: uniqueIds([...(user.favoriteArtists ?? []), artistId]),
await getAlbumIdsForArtist(ctx, artistId) favoriteAlbums: uniqueIds([...(user.favoriteAlbums ?? []), ...albumIds]),
) favoriteSongs: uniqueIds([...(user.favoriteSongs ?? []), ...songIds]),
await addFavorites( })
ctx,
userId,
"song",
await getSongIdsForArtist(ctx, artistId)
)
}, },
}) })
/** Unfavorites an artist along with all of their albums and songs. */
export const unfavoriteArtist = mutation({ export const unfavoriteArtist = mutation({
args: { artistId: v.id("artists") }, args: { artistId: v.id("artists") },
handler: async (ctx, { artistId }) => { handler: async (ctx, { artistId }) => {
const userId = await requireFavoritesUser(ctx) const userId = await requireAuth(ctx)
await removeFavorites(ctx, userId, "artist", [artistId]) const user = await ctx.db.get("users", userId)
await removeFavorites( if (!user) {
ctx, throw new ConvexError("User not found")
userId, }
"album",
await getAlbumIdsForArtist(ctx, artistId) const albumIds = await getAlbumIdsForArtist(ctx, artistId)
) const songIds = await getSongIdsForArtist(ctx, artistId)
await removeFavorites( const removeAlbums = new Set(albumIds)
ctx, const removeSongs = new Set(songIds)
userId,
"song", await ctx.db.patch(userId, {
await getSongIdsForArtist(ctx, artistId) favoriteArtists: (user.favoriteArtists ?? []).filter(
) (id) => id !== artistId
),
favoriteAlbums: (user.favoriteAlbums ?? []).filter(
(id) => !removeAlbums.has(id)
),
favoriteSongs: (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
),
})
}, },
}) })
+5 -5
View File
@@ -1,8 +1,8 @@
import { httpRouter } from "convex/server" import { httpRouter } from "convex/server";
import { auth } from "./auth" import { auth } from "./auth";
const http = httpRouter() const http = httpRouter();
auth.addHttpRoutes(http) auth.addHttpRoutes(http);
export default http export default http;
+22 -80
View File
@@ -21,8 +21,6 @@ import type {
SearchTopResultItem, SearchTopResultItem,
SidebarPlaylists, SidebarPlaylists,
} from "./types" } from "./types"
import { purgeFavoriteEntities } from "./favoriteStore"
import { chunk, type Chunked } from "./limits"
import { recordIntentCatalogChanges } from "./intentCatalogChanges" import { recordIntentCatalogChanges } from "./intentCatalogChanges"
export type { export type {
@@ -156,19 +154,10 @@ function toBrowseAlbum(
} }
} }
/**
* Past this many songs, scanning the library takes fewer reads than a get per
* song, album and artist, which would hit Convex's 4,096 reads per function.
*/
const MAX_SONG_GETS = 1_000
export async function browseSongsFromIds( export async function browseSongsFromIds(
ctx: QueryCtx, ctx: QueryCtx,
songIds: Id<"songs">[] songIds: Id<"songs">[]
): Promise<BrowseSong[]> { ): Promise<BrowseSong[]> {
if (songIds.length > MAX_SONG_GETS) {
return browseSongsByScan(ctx, songIds)
}
const songs = await Promise.all( const songs = await Promise.all(
songIds.map((songId) => ctx.db.get("songs", songId)) songIds.map((songId) => ctx.db.get("songs", songId))
) )
@@ -178,27 +167,6 @@ export async function browseSongsFromIds(
) )
} }
async function browseSongsByScan(
ctx: QueryCtx,
songIds: Id<"songs">[]
): Promise<BrowseSong[]> {
const [songs, albums, artistMap] = await Promise.all([
ctx.db.query("songs").collect(),
ctx.db.query("albums").collect(),
loadArtistMap(ctx),
])
const songMap = new Map(songs.map((song) => [song._id, song]))
const albumMap = new Map(albums.map((album) => [album._id, album]))
return songIds.flatMap((songId) => {
const song = songMap.get(songId)
const album = song && albumMap.get(song.album)
const albumArtist = song && artistMap.get(song.albumArtist)
return song && album && albumArtist
? [toBrowseSong(song, album, albumArtist)]
: []
})
}
async function browseSongDocs( async function browseSongDocs(
ctx: QueryCtx, ctx: QueryCtx,
songs: Doc<"songs">[] songs: Doc<"songs">[]
@@ -246,34 +214,32 @@ function toBrowseSong(
export const browseAlbums = query({ export const browseAlbums = query({
args: {}, args: {},
handler: async (ctx): Promise<Chunked<BrowseAlbum>> => { handler: async (ctx) => {
if (!(await isSignedIn(ctx))) { if (!(await isSignedIn(ctx))) {
return [] return []
} }
const artistMap = await loadArtistMap(ctx) const artistMap = await loadArtistMap(ctx)
const albums = await ctx.db.query("albums").collect() const albums = await ctx.db.query("albums").collect()
return chunk( return albums
albums .flatMap((album) => {
.flatMap((album) => { const artist = artistMap.get(album.artist)
const artist = artistMap.get(album.artist) return artist ? [toBrowseAlbum(album, artist)] : []
return artist ? [toBrowseAlbum(album, artist)] : [] })
}) .sort((a, b) => a.title.localeCompare(b.title))
.sort((a, b) => a.title.localeCompare(b.title))
)
}, },
}) })
export const browseArtists = query({ export const browseArtists = query({
args: {}, args: {},
handler: async (ctx): Promise<Chunked<BrowseArtist>> => { handler: async (ctx) => {
if (!(await isSignedIn(ctx))) { if (!(await isSignedIn(ctx))) {
return [] return []
} }
const artists = await ctx.db.query("artists").collect() const artists = await ctx.db.query("artists").collect()
return chunk( return artists
artists.map(toBrowseArtist).sort((a, b) => a.name.localeCompare(b.name)) .map(toBrowseArtist)
) .sort((a, b) => a.name.localeCompare(b.name))
}, },
}) })
@@ -542,9 +508,7 @@ export const browseSortedSongIds = query({
}, },
handler: async (ctx, args) => { handler: async (ctx, args) => {
await requireSignedIn(ctx) await requireSignedIn(ctx)
return chunk( return getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection)
await getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection)
)
}, },
}) })
@@ -641,12 +605,6 @@ function matchScoreSongArtists(
) )
} }
/**
* Results kept per search section. Broad queries like "a" match most of the
* library, which would overflow Convex's array limit and is too long to scroll.
*/
const MAX_SEARCH_RESULTS = 500
export const searchLibrary = query({ export const searchLibrary = query({
args: { query: v.string() }, args: { query: v.string() },
handler: async (ctx, args) => { handler: async (ctx, args) => {
@@ -742,15 +700,9 @@ export const searchLibrary = query({
const result: LibrarySearchResults = { const result: LibrarySearchResults = {
topResults, topResults,
artists: artistResults artists: artistResults.map((result) => result.item),
.slice(0, MAX_SEARCH_RESULTS) albums: albumResults.map((result) => result.item),
.map((result) => result.item), songs: songResults.map((result) => result.item),
albums: albumResults
.slice(0, MAX_SEARCH_RESULTS)
.map((result) => result.item),
songs: songResults
.slice(0, MAX_SEARCH_RESULTS)
.map((result) => result.item),
} }
return result return result
}, },
@@ -758,7 +710,7 @@ export const searchLibrary = query({
export const browseRecentlyAdded = query({ export const browseRecentlyAdded = query({
args: { limit: v.optional(v.number()) }, args: { limit: v.optional(v.number()) },
handler: async (ctx, args): Promise<Chunked<BrowseAlbum>> => { handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) { if (!(await isSignedIn(ctx))) {
return [] return []
} }
@@ -771,12 +723,10 @@ export const browseRecentlyAdded = query({
albums.map((album) => album.artist) albums.map((album) => album.artist)
) )
return chunk( return albums.flatMap((album) => {
albums.flatMap((album) => { const artist = artistMap.get(album.artist)
const artist = artistMap.get(album.artist) return artist ? [toBrowseAlbum(album, artist)] : []
return artist ? [toBrowseAlbum(album, artist)] : [] })
})
)
}, },
}) })
@@ -943,6 +893,7 @@ export const scanSongsPage = internalQuery({
}, },
}) })
/** Public: share-link previews load covers without a session. */ /** Public: share-link previews load covers without a session. */
export const getArtistCover = query({ export const getArtistCover = query({
args: { id: v.id("artists") }, args: { id: v.id("artists") },
@@ -1211,10 +1162,7 @@ async function purgeSongsFromUsersAndPlaylists(
} }
} }
await purgeFavoriteEntities(ctx, remove) // Legacy queue fields stay until `migrations.migrateUsers` clears them.
// Legacy favorite and queue fields stay until `migrations.migrateUsers`
// clears them.
for (const user of await ctx.db.query("users").collect()) { for (const user of await ctx.db.query("users").collect()) {
const favoriteSongs = user.favoriteSongs const favoriteSongs = user.favoriteSongs
const songQueue = user.songQueue const songQueue = user.songQueue
@@ -1255,9 +1203,6 @@ async function purgeAlbumsFromUsers(
return return
} }
await purgeFavoriteEntities(ctx, remove)
// Legacy `favoriteAlbums` stays until `migrations.migrateUsers` clears it.
for (const user of await ctx.db.query("users").collect()) { for (const user of await ctx.db.query("users").collect()) {
const favoriteAlbums = user.favoriteAlbums const favoriteAlbums = user.favoriteAlbums
const recentlyPlayed = user.recentlyPlayed const recentlyPlayed = user.recentlyPlayed
@@ -1288,9 +1233,6 @@ async function purgeArtistsFromUsers(
return return
} }
await purgeFavoriteEntities(ctx, remove)
// Legacy `favoriteArtists` stays until `migrations.migrateUsers` clears it.
for (const user of await ctx.db.query("users").collect()) { for (const user of await ctx.db.query("users").collect()) {
const favoriteArtists = user.favoriteArtists const favoriteArtists = user.favoriteArtists
if (favoriteArtists?.some((artistId) => remove.has(artistId))) { if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
-17
View File
@@ -8,20 +8,3 @@ export const MAX_QUEUE_LENGTH = 5_000
/** Largest profile photo accepted, in bytes after base64 decoding. */ /** Largest profile photo accepted, in bytes after base64 decoding. */
export const MAX_PROFILE_IMAGE_BYTES = 2 * 1024 * 1024 export const MAX_PROFILE_IMAGE_BYTES = 2 * 1024 * 1024
/** Most values Convex accepts in a single array. */
export const MAX_ARRAY_LENGTH = 8_192
/**
* A list split into arrays of at most `MAX_ARRAY_LENGTH` values, so a query can
* return more than one array allows. Read it back with `.flat()`.
*/
export type Chunked<T> = T[][]
export function chunk<T>(items: readonly T[]): Chunked<T> {
const chunks: Chunked<T> = []
for (let start = 0; start < items.length; start += MAX_ARRAY_LENGTH) {
chunks.push(items.slice(start, start + MAX_ARRAY_LENGTH))
}
return chunks
}
+2 -21
View File
@@ -1,15 +1,13 @@
import { v } from "convex/values" import { v } from "convex/values"
import { internal } from "./_generated/api" import { internal } from "./_generated/api"
import { internalMutation } from "./_generated/server" import { internalMutation } from "./_generated/server"
import { hasLegacyFavorites, migrateUserFavorites } from "./favoriteStore"
import { hasLegacyPlayback, migrateUserPlayback } from "./playbackState" import { hasLegacyPlayback, migrateUserPlayback } from "./playbackState"
const BATCH_SIZE = 25 const BATCH_SIZE = 25
/** /**
* Moves playback state off `users` into `playbackStates`/`playbackProgress`, * Moves playback state off `users` into `playbackStates`/`playbackProgress`
* favorite arrays into `favorites` rows, and legacy data URL avatars into * and legacy data URL avatars into file storage. Idempotent; the Docker
* file storage. Idempotent; the Docker
* entrypoint runs it on every boot. Run manually with * entrypoint runs it on every boot. Run manually with
* `npx convex run migrations:migrateUsers`. * `npx convex run migrations:migrateUsers`.
*/ */
@@ -24,12 +22,6 @@ export const migrateUsers = internalMutation({
if (hasLegacyPlayback(user)) { if (hasLegacyPlayback(user)) {
await migrateUserPlayback(ctx, user) await migrateUserPlayback(ctx, user)
} }
if (hasLegacyFavorites(user)) {
// One mutation per user: a large library can mean thousands of rows.
await ctx.scheduler.runAfter(0, internal.migrations.migrateFavorites, {
userId: user._id,
})
}
if (!user.imageStorageId && user.image?.startsWith("data:")) { if (!user.imageStorageId && user.image?.startsWith("data:")) {
await ctx.scheduler.runAfter(0, internal.users.storeProfileImage, { await ctx.scheduler.runAfter(0, internal.users.storeProfileImage, {
userId: user._id, userId: user._id,
@@ -45,14 +37,3 @@ export const migrateUsers = internalMutation({
} }
}, },
}) })
/** Moves one user's favorites into rows. Scheduled by `migrateUsers`. */
export const migrateFavorites = internalMutation({
args: { userId: v.id("users") },
handler: async (ctx, { userId }) => {
const user = await ctx.db.get(userId)
if (user) {
await migrateUserFavorites(ctx, user)
}
},
})
+2 -3
View File
@@ -3,7 +3,6 @@ import { ConvexError, v } from "convex/values"
import type { Doc, Id } from "./_generated/dataModel" import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx, QueryCtx } from "./_generated/server" import type { MutationCtx, QueryCtx } from "./_generated/server"
import { mutation, query } from "./_generated/server" import { mutation, query } from "./_generated/server"
import { chunk } from "./limits"
import type { import type {
BrowsePlaylistDetail, BrowsePlaylistDetail,
BrowsePlaylistSummary, BrowsePlaylistSummary,
@@ -291,7 +290,7 @@ export const getArtistSongIds = query({
.query("songs") .query("songs")
.withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId)) .withIndex("by_artist", (q) => q.eq("albumArtist", args.artistId))
.collect() .collect()
return chunk(songs.map((song) => song._id)) return songs.map((song) => song._id)
}, },
}) })
@@ -322,7 +321,7 @@ export const getOrderedArtistSongIds = query({
return a.name.localeCompare(b.name) return a.name.localeCompare(b.name)
}) })
return chunk(songs.map((song) => song._id)) return songs.map((song) => song._id)
}, },
}) })
-27
View File
@@ -27,8 +27,6 @@ export default defineSchema({
), ),
preferAtmos: v.optional(v.boolean()), preferAtmos: v.optional(v.boolean()),
subscribedPlaylists: v.optional(v.array(v.id("playlists"))), subscribedPlaylists: v.optional(v.array(v.id("playlists"))),
// Legacy favorites, now rows in `favorites`. `migrations.migrateUsers`
// clears them; drop them once every deployment has run it.
favoriteArtists: v.optional(v.array(v.id("artists"))), favoriteArtists: v.optional(v.array(v.id("artists"))),
favoriteAlbums: v.optional(v.array(v.id("albums"))), favoriteAlbums: v.optional(v.array(v.id("albums"))),
favoriteSongs: v.optional(v.array(v.id("songs"))), favoriteSongs: v.optional(v.array(v.id("songs"))),
@@ -60,31 +58,6 @@ export default defineSchema({
songId: v.optional(v.id("songs")), songId: v.optional(v.id("songs")),
progressSeconds: v.number(), progressSeconds: v.number(),
}).index("by_user", ["userId"]), }).index("by_user", ["userId"]),
// One row per favorite. `by_user_kind` lists them in the order they were
// favorited (the Favorites playlist order), `by_user_entity` answers "is this
// favorited", and `by_entity` lets the scanner purge deleted media.
favorites: defineTable(
v.union(
v.object({
userId: v.id("users"),
kind: v.literal("song"),
entityId: v.id("songs"),
}),
v.object({
userId: v.id("users"),
kind: v.literal("album"),
entityId: v.id("albums"),
}),
v.object({
userId: v.id("users"),
kind: v.literal("artist"),
entityId: v.id("artists"),
})
)
)
.index("by_user_kind", ["userId", "kind"])
.index("by_user_entity", ["userId", "entityId"])
.index("by_entity", ["entityId"]),
authVerifiers: defineTable({ authVerifiers: defineTable({
sessionId: v.optional(v.id("authSessions")), sessionId: v.optional(v.id("authSessions")),
signature: v.optional(v.string()), signature: v.optional(v.string()),
-6
View File
@@ -1,5 +1,4 @@
import type { Id } from "./_generated/dataModel" import type { Id } from "./_generated/dataModel"
import type { Chunked } from "./limits"
export type BrowseArtist = { export type BrowseArtist = {
id: Id<"artists"> id: Id<"artists">
@@ -76,11 +75,6 @@ export type BrowsePlaylistDetail = {
isSubscribed: boolean isSubscribed: boolean
} }
/** Favorites can outgrow one array, so its songs come back chunked. */
export type BrowseFavoritesDetail = Omit<BrowsePlaylistDetail, "songs"> & {
songs: Chunked<BrowseSong>
}
export type BrowsePlaylistSummary = Omit<BrowsePlaylistDetail, "songs"> & { export type BrowsePlaylistSummary = Omit<BrowsePlaylistDetail, "songs"> & {
songIds: Id<"songs">[] songIds: Id<"songs">[]
} }
-2
View File
@@ -16,7 +16,6 @@ import {
import type { Doc, Id } from "./_generated/dataModel" import type { Doc, Id } from "./_generated/dataModel"
import type { ActionCtx, MutationCtx } from "./_generated/server" import type { ActionCtx, MutationCtx } from "./_generated/server"
import { MAX_PROFILE_IMAGE_BYTES } from "./limits" import { MAX_PROFILE_IMAGE_BYTES } from "./limits"
import { deleteUserFavorites } from "./favoriteStore"
import { deleteUserPlayback } from "./playbackState" import { deleteUserPlayback } from "./playbackState"
const playbackQualityValidator = v.union( const playbackQualityValidator = v.union(
@@ -401,7 +400,6 @@ export const deleteUser = mutation({
} }
await deleteOwnedPlaylists(ctx, userId) await deleteOwnedPlaylists(ctx, userId)
await deleteUserPlayback(ctx, userId) await deleteUserPlayback(ctx, userId)
await deleteUserFavorites(ctx, userId)
await setProfileImage(ctx, userId, null) await setProfileImage(ctx, userId, null)
await deleteUserAuthData(ctx, userId) await deleteUserAuthData(ctx, userId)
}, },