Compare commits

..
107 changed files with 2228 additions and 3907 deletions

No files matched your search

+1 -3
View File
@@ -127,9 +127,7 @@ function TabsContent() {
tintColor={tabColors.tintColor}
minimizeBehavior="onScrollDown"
{...(Platform.OS === "android"
? // A new ripple color rebuilds Material's item backgrounds and
// cuts off the in-flight ripple, so it must not follow the palette.
{ disableIndicator: true, rippleColor: appleMusic.tabInactive }
? { disableIndicator: true, rippleColor: tabColors.tintColor }
: {})}
>
{Platform.OS === "ios" && !tabletLayout && showBottomAccessory ? (
+1 -4
View File
@@ -62,10 +62,7 @@ export default function HomeScreen() {
return (
<ScrollView
style={{ flex: 1, backgroundColor: colors.background }}
contentContainerStyle={[
styles.content,
{ paddingBottom: tabContentBottomInset },
]}
contentContainerStyle={[styles.content, { paddingBottom: tabContentBottomInset }]}
contentInsetAdjustmentBehavior="automatic"
>
<HomeCarousels recentlyAdded={added} recentlyPlayed={played} />
@@ -68,7 +68,6 @@ const OWNER_MENU_ACTIONS: MediaAction[] = [
"play-last",
"shuffle",
"favorite",
"change-cover",
"delete-playlist",
]
@@ -84,11 +83,7 @@ export default function PlaylistScreen() {
const songs = playlist?.songs
const coverUri =
config && playlistId
? playlistCoverUrl(
config.serverUrl,
playlist?.id ?? playlistId,
playlist?.cover ?? null
)
? playlistCoverUrl(config.serverUrl, playlist?.id ?? playlistId)
: ""
const { palette: artworkPalette, settled } = useCoverPalette(
coverUri,
@@ -266,15 +261,6 @@ function PlaylistContent({
void handleDelete()
return
}
if (action === "change-cover") {
if (playlistId) {
router.push({
pathname: "/playlist-cover",
params: { id: playlistId },
})
}
return
}
void handlePlaylistDetailAction(songIds, action)
}
@@ -36,7 +36,7 @@ export default function FavoritesScreen() {
const colors = useThemeColors()
const { config } = useServerConfig()
const favorites = useCachedQuery(api.favorites.browseFavoritesPlaylistDetail)
const songs = useMemo(() => favorites?.songs.flat() ?? [], [favorites])
const songs = favorites?.songs ?? []
const { playInOrder, playShuffled, playFromSong } = usePlaybackActions()
const { isSongFavorite } = useFavorites()
const { handleSongAction } = useMediaMenuActions()
@@ -45,8 +45,8 @@ export default function FavoritesScreen() {
usePlaylistSearch(songs)
useEffect(() => {
rememberSongs(songs)
}, [songs])
if (favorites) rememberSongs(favorites.songs)
}, [favorites])
const handlePlaySong = useCallback(
(song: BrowseSong) => void playFromSong(song.id, songIds),
-16
View File
@@ -106,22 +106,6 @@ export default function AppLayout() {
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="playlist-cover"
options={{
title: "Cover",
headerTitleAlign: "center",
presentation:
Platform.OS === "ios" ? "modal" : "fullScreenModal",
animation: "slide_from_bottom",
headerLargeTitle: false,
headerTransparent: false,
headerShadowVisible: false,
headerStyle: { backgroundColor: "#000" },
headerTintColor: "#fff",
contentStyle: { backgroundColor: "#000" },
}}
/>
<Stack.Screen
name="player"
options={{
-391
View File
@@ -1,391 +0,0 @@
import { useMutation } from "convex/react"
import { Image } from "expo-image"
import * as ImagePicker from "expo-image-picker"
import { router, Stack, useLocalSearchParams } from "expo-router"
import { useMemo, useState, type ReactNode } from "react"
import {
Pressable,
ScrollView,
StyleSheet,
Text,
useWindowDimensions,
View,
} from "react-native"
import { CoverImage } from "@/components/cover-image"
import { Button, LoadingView } from "@/components/ui/primitives"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { showError } from "@/lib/toast"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/urls"
import { radius, spacing, useThemeColors } from "@/lib/theme"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
COVER_GRID_ALBUMS,
playlistCoverAlbums,
randomPlaylistCovers,
} from "@otunes/convex/client/playlist-cover"
type Choice =
| { kind: "current" }
| { kind: "albums"; albumIds: Id<"albums">[] }
| { kind: "upload"; uri: string; image: string }
const STRIP_GAP = spacing.sm
/** Selection border and padding around each thumb, both sides. */
const THUMB_CHROME = 6
/**
* Full screen cover editor for a playlist owner: a large preview of the
* selected cover, the current cover pinned apart from four random album
* grids, and Save in the header. Opened from the playlist's menu.
*/
export default function PlaylistCoverScreen() {
const { id } = useLocalSearchParams<{ id: string }>()
const playlistId = id as Id<"playlists">
const playlist = useCachedQuery(api.playlists.browsePlaylistDetail, {
id: playlistId,
})
const { config } = useServerConfig()
const colors = useThemeColors()
const { width } = useWindowDimensions()
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
const albums = useMemo(
() => (playlist ? playlistCoverAlbums(playlist.songs) : []),
[playlist]
)
const [options, setOptions] = useState<Id<"albums">[][] | null>(null)
const [selected, setSelected] = useState<Choice | null>(null)
const [saving, setSaving] = useState(false)
// Draw options once the songs arrive.
if (options === null && playlist) {
setOptions(randomPlaylistCovers(albums))
}
const hasCurrent = playlist?.cover != null
const choice: Choice | null =
selected ??
(hasCurrent
? { kind: "current" }
: options?.[0]
? { kind: "albums", albumIds: options[0] }
: null)
async function pickImage() {
const result = await ImagePicker.launchImageLibraryAsync({
mediaTypes: ["images"],
allowsEditing: true,
aspect: [1, 1],
quality: 0.7,
base64: true,
})
const asset = result.canceled ? undefined : result.assets[0]
if (!asset?.base64) return
setSelected({
kind: "upload",
uri: asset.uri,
image: `data:${asset.mimeType ?? "image/jpeg"};base64,${asset.base64}`,
})
}
async function save() {
if (!choice || choice.kind === "current") {
router.back()
return
}
setSaving(true)
try {
if (choice.kind === "albums") {
await setCoverAlbums({ playlistId, albumIds: choice.albumIds })
} else {
await uploadCover({ playlistId, image: choice.image })
}
router.back()
} catch (error) {
showError(
error instanceof Error ? error.message : "Failed to change cover"
)
setSaving(false)
}
}
const header = (
<Stack.Screen
options={{
headerLeft: () => (
<HeaderButton label="Cancel" onPress={() => router.back()} />
),
headerRight: () => (
<HeaderButton
label="Save"
bold
disabled={saving || !choice}
onPress={() => void save()}
/>
),
}}
/>
)
if (!playlist || !config || !options) {
return (
<>
{header}
<LoadingView />
</>
)
}
const serverUrl = config.serverUrl
const currentUri = playlistCoverUrl(serverUrl, playlistId, playlist.cover)
const previewSize = Math.min(width - spacing.lg * 2, 360)
// One row: current | uploaded? | options, thumbs at most 72pt.
const thumbCount =
options.length + (hasCurrent ? 1 : 0) + (choice?.kind === "upload" ? 1 : 0)
const rowItems = thumbCount + (hasCurrent ? 1 : 0)
const thumbSize = Math.min(
72,
Math.floor(
(width - spacing.lg * 2 - STRIP_GAP * (rowItems - 1) - 1) /
Math.max(thumbCount, 1)
) - THUMB_CHROME
)
function renderChoice(item: Choice, size: number) {
if (item.kind === "current") {
return (
<CoverImage
uri={currentUri}
hasCover
style={{ width: size, height: size }}
/>
)
}
if (item.kind === "upload") {
return (
<Image
source={{ uri: item.uri }}
style={{ width: size, height: size }}
/>
)
}
return (
<AlbumGrid serverUrl={serverUrl} albumIds={item.albumIds} size={size} />
)
}
const isSelected = (item: Choice) =>
choice?.kind === item.kind &&
(item.kind !== "albums" ||
(choice.kind === "albums" && choice.albumIds === item.albumIds))
return (
<ScrollView
style={{ backgroundColor: colors.background }}
contentContainerStyle={styles.content}
>
{header}
<View
style={[
styles.preview,
{
width: previewSize,
height: previewSize,
backgroundColor: colors.coverPlaceholder,
},
]}
>
{choice ? renderChoice(choice, previewSize) : null}
</View>
<View style={styles.strip}>
{hasCurrent ? (
<>
<Thumb
size={thumbSize}
selected={isSelected({ kind: "current" })}
label="Current cover"
onPress={() => setSelected({ kind: "current" })}
>
{renderChoice({ kind: "current" }, thumbSize)}
</Thumb>
<View
style={[styles.separator, { backgroundColor: colors.border }]}
/>
</>
) : null}
{choice?.kind === "upload" ? (
<Thumb size={thumbSize} selected label="Uploaded image">
{renderChoice(choice, thumbSize)}
</Thumb>
) : null}
{options.map((albumIds) => {
const item: Choice = { kind: "albums", albumIds }
return (
<Thumb
key={albumIds.join(",")}
size={thumbSize}
selected={isSelected(item)}
label="Album cover option"
onPress={() => setSelected(item)}
>
{renderChoice(item, thumbSize)}
</Thumb>
)
})}
</View>
{albums.length === 0 ? (
<Text style={{ color: colors.mutedForeground, textAlign: "center" }}>
No album artwork in this playlist yet.
</Text>
) : null}
<View style={styles.actions}>
{albums.length >= COVER_GRID_ALBUMS ? (
<Button
title="Shuffle"
icon="shuffle"
variant="secondary"
onPress={() => {
setOptions(randomPlaylistCovers(albums))
if (selected?.kind === "albums") setSelected(null)
}}
/>
) : null}
<Button
title="Upload"
icon="arrow-up"
variant="secondary"
onPress={() => void pickImage()}
/>
</View>
</ScrollView>
)
}
function HeaderButton({
label,
bold = false,
disabled = false,
onPress,
}: {
label: string
bold?: boolean
disabled?: boolean
onPress: () => void
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
hitSlop={8}
disabled={disabled}
onPress={onPress}
style={{ opacity: disabled ? 0.4 : 1, paddingHorizontal: spacing.xs }}
>
<Text
style={{
color: colors.foreground,
fontSize: 17,
fontWeight: bold ? "600" : "400",
}}
>
{label}
</Text>
</Pressable>
)
}
function Thumb({
size,
selected,
label,
onPress,
children,
}: {
size: number
selected: boolean
label: string
onPress?: () => void
children: ReactNode
}) {
const colors = useThemeColors()
return (
<Pressable
accessibilityRole="button"
accessibilityLabel={label}
accessibilityState={{ selected }}
onPress={onPress}
style={[
styles.thumb,
{
width: size + THUMB_CHROME,
height: size + THUMB_CHROME,
borderColor: selected ? colors.foreground : "transparent",
},
]}
>
<View style={styles.thumbInner}>{children}</View>
</Pressable>
)
}
/** A generated cover option: one album alone, or four tiled 2x2. */
function AlbumGrid({
serverUrl,
albumIds,
size,
}: {
serverUrl: string
albumIds: Id<"albums">[]
size: number
}) {
const tile = albumIds.length > 1 ? size / 2 : size
return (
<View
style={{
width: size,
height: size,
flexDirection: "row",
flexWrap: "wrap",
}}
>
{albumIds.map((albumId) => (
<CoverImage
key={albumId}
uri={albumCoverUrl(serverUrl, albumId)}
hasCover
style={{ width: tile, height: tile }}
/>
))}
</View>
)
}
const styles = StyleSheet.create({
content: {
alignItems: "center",
gap: spacing.xl,
padding: spacing.lg,
},
preview: { borderRadius: radius.lg, overflow: "hidden" },
strip: {
flexDirection: "row",
alignItems: "center",
justifyContent: "center",
gap: STRIP_GAP,
},
separator: { width: StyleSheet.hairlineWidth, alignSelf: "stretch" },
thumb: {
borderWidth: 2,
borderRadius: radius.sm + 2,
padding: 1,
},
thumbInner: { flex: 1, borderRadius: radius.sm, overflow: "hidden" },
actions: { flexDirection: "row", gap: spacing.sm },
})
@@ -23,16 +23,19 @@ type LibraryKind = (typeof LIBRARY_KINDS)[number]
const PAGE_SIZE = 500
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) {
return new Set<string>(
(kind === "song"
kind === "song"
? favorites.favoriteSongs
: kind === "album"
? favorites.favoriteAlbums
: favorites.favoriteArtists
).flat()
)
}
@@ -214,13 +214,12 @@ export function useIntentDispatch() {
)
}
if (kind === "artist") {
const chunks = await fetchCachedQuery(
return fetchCachedQuery(
convex,
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId: id as Id<"artists"> }
)
return chunks.flat()
}
if (kind === "playlist") {
if (id === FAVORITES_PLAYLIST_ID) {
@@ -230,7 +229,7 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
return favorites.favoriteSongs.flat()
return favorites.favoriteSongs
}
return fetchCachedQuery(
convex,
@@ -392,18 +391,17 @@ export function useIntentDispatch() {
api.favorites.getUserFavorites,
{}
)
const favoriteSongs = favorites.favoriteSongs.flat()
if (favoriteSongs.length === 0) {
if (favorites.favoriteSongs.length === 0) {
throw new IntentRejected(
"Nothing is queued, and your favorites are empty."
)
}
if (shuffled) {
ensureActive(invocation)
await actions.playShuffled(favoriteSongs)
await actions.playShuffled(favorites.favoriteSongs)
} else {
ensureActive(invocation)
await actions.playInOrder(favoriteSongs)
await actions.playInOrder(favorites.favoriteSongs)
}
return
}
@@ -71,10 +71,7 @@ class ConvexAuthErrorBoundary extends Component<
}
}
export function ConvexAuthRecovery({
children,
onInvalidate,
}: ConvexAuthRecoveryProps) {
export function ConvexAuthRecovery({ children, onInvalidate }: ConvexAuthRecoveryProps) {
const localAuth = useLocalConvexAuth()
const serverAuth = useServerConvexAuth()
const hadServerAuthRef = useRef(false)
@@ -116,9 +113,9 @@ export function ConvexAuthRecovery({
const sessionEstablished = Boolean(
serverAuth &&
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
!serverAuth.isLoading &&
!serverAuth.isRefreshing &&
serverAuth.isAuthenticated
)
return (
@@ -112,10 +112,7 @@ function SwipeRowBody({
setIsOpen(false)
}, [removing, translateX])
const handleSwipeStart = useCallback(
() => group.setOpen(close),
[close, group]
)
const handleSwipeStart = useCallback(() => group.setOpen(close), [close, group])
const handleSettle = useCallback(
(open: boolean) => {
@@ -254,7 +251,8 @@ function SwipeRowBody({
const pillWidth = Math.max(
0,
resting +
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) * commitProgress.value
(revealed - PILL_COMMITTED_MARGIN * 2 - resting) *
commitProgress.value
)
const restingHeight = interpolate(
pillWidth,
+1 -5
View File
@@ -200,11 +200,7 @@ export const PlaylistCard = memo(function PlaylistCard({
<Link.AppleZoom>
<View collapsable={false}>
<CoverImage
uri={playlistCoverUrl(
config.serverUrl,
playlist.id,
playlist.cover
)}
uri={playlistCoverUrl(config.serverUrl, playlist.id)}
hasCover={playlist.cover != null}
style={
fluid
@@ -33,7 +33,6 @@ export type MediaAction =
| "go-artist"
| "go-album"
| "remove-from-playlist"
| "change-cover"
| "delete-playlist"
export type MediaNavigation = {
@@ -129,11 +128,6 @@ const MEDIA_ACTION_ITEMS: {
image: "minus.circle",
destructive: true,
},
{
action: "change-cover",
label: () => "Change Cover",
image: "photo",
},
{
action: "delete-playlist",
label: () => "Delete Playlist",
@@ -157,7 +151,7 @@ function isActionIncluded(
return config.includeActions.includes(action)
}
if (action === "delete-playlist" || action === "change-cover") {
if (action === "delete-playlist") {
return false
}
@@ -26,7 +26,6 @@ const actionIcons = {
"go-artist": "person-outline",
"go-album": "disc-outline",
"remove-from-playlist": "remove-circle-outline",
"change-cover": "image-outline",
"delete-playlist": "trash-outline",
} satisfies Record<MediaAction, ComponentProps<typeof Ionicons>["name"]>
+1 -34
View File
@@ -1,19 +1,13 @@
import { useOpenSettings } from "@/hooks/use-open-settings"
import { requireNativeView } from "expo"
import { useIsFocused, useRouter } from "expo-router"
import { useMemo } from "react"
import { useIsFocused } from "expo-router"
import { Platform, type ViewProps } from "react-native"
import { useServerConfig } from "@/contexts/server-config"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useProfileImageUrl } from "@/hooks/use-profile-image-url"
import { tabPath } from "@/lib/app-navigation"
import { initialsFromName } from "@/lib/format"
import { playlistCoverUrl } from "@/lib/urls"
import { api } from "@otunes/convex/_generated/api"
type SidebarPlaylist = { id: string; title: string; imageURL?: string }
const NativeSidebar =
Platform.OS === "ios"
? requireNativeView<
@@ -22,39 +16,16 @@ const NativeSidebar =
initials: string
imageURL?: string
active: boolean
playlists: SidebarPlaylist[]
onProfilePress: () => void
onPlaylistPress: (event: { nativeEvent: { id: string } }) => void
}
>("TabletSidebar")
: null
/** iPad sidebar extras: the account footer and a row per playlist with its cover. */
export function TabletSidebar() {
const user = useCachedQuery(api.auth.currentUser)
const sidebarPlaylists = useCachedQuery(api.playlists.listSidebarPlaylists)
const { config } = useServerConfig()
const imageUrl = useProfileImageUrl(user?.image)
const openSettings = useOpenSettings()
const router = useRouter()
const active = useIsFocused()
const serverUrl = config?.serverUrl
const playlists = useMemo(
() =>
[
...(sidebarPlaylists?.owned ?? []),
...(sidebarPlaylists?.subscribed ?? []),
].map((playlist): SidebarPlaylist => ({
id: playlist.id,
title: playlist.title,
imageURL:
serverUrl && playlist.cover
? playlistCoverUrl(serverUrl, playlist.id, playlist.cover, 64)
: undefined,
})),
[serverUrl, sidebarPlaylists]
)
if (!NativeSidebar) return null
return (
@@ -64,11 +35,7 @@ export function TabletSidebar() {
initials={initialsFromName(user?.name ?? "Me")}
imageURL={imageUrl}
active={active}
playlists={playlists}
onProfilePress={openSettings}
onPlaylistPress={({ nativeEvent }) =>
router.navigate(tabPath("(playlists)", `/playlist/${nativeEvent.id}`))
}
/>
)
}
+1 -1
View File
@@ -150,7 +150,7 @@ export function AddToPlaylistProvider({ children }: { children: ReactNode }) {
{ artistId }
)
if (selectionRequestIdRef.current !== requestId) return
setPendingSongIds(songIds.flat())
setPendingSongIds(songIds)
setOpen(true)
} catch (error) {
if (selectionRequestIdRef.current !== requestId) return
+3 -3
View File
@@ -100,15 +100,15 @@ export function FavoritesProvider({ children }: { children: ReactNode }) {
)
const songIds = useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()),
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs]
)
const albumIds = useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()),
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums]
)
const artistIds = useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()),
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
[favorites?.favoriteArtists]
)
const idsRef = useRef({ songIds, albumIds, artistIds })
+7 -9
View File
@@ -401,7 +401,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
).then((chunks) => chunks.flat()),
),
recorded: { entity: { kind: "artist", id: artistId } },
}))
const playlist = collection(
@@ -482,14 +482,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
} catch {
return
}
+1 -5
View File
@@ -83,11 +83,7 @@ export function createCoverPaletteSource<Swatches>({
const [waitedKey, setWaitedKey] = useState<string | null>(null)
const swatches =
resolved.key === key
? resolved.swatches
: key
? cachedSwatches(key)
: null
resolved.key === key ? resolved.swatches : key ? cachedSwatches(key) : null
useEffect(() => {
if (!key || hasCover === false) return
+1 -1
View File
@@ -173,7 +173,7 @@ export function useMediaMenuActions() {
api.playlists.getOrderedArtistSongIds,
{ artistId: artist.id as Id<"artists"> }
)
await runQueueAction(action, songIds.flat())
await runQueueAction(action, songIds)
break
}
default:
+4 -1
View File
@@ -1,6 +1,9 @@
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 {
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}`
}
export async function clearStoredAuthTokens(
storageNamespace: string
): Promise<void> {
export async function clearStoredAuthTokens(storageNamespace: string): Promise<void> {
await Promise.all(
AUTH_STORAGE_KEYS.map((key) =>
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")}`
}
export function formatRemainingDuration(
current: number,
total: number
): string {
export function formatRemainingDuration(current: number, total: number): string {
const remaining = Math.max(0, Math.floor(total) - Math.floor(current))
return `-${formatDuration(remaining)}`
}
+5 -17
View File
@@ -79,9 +79,7 @@ export function deriveCoverPalette(
secondaryForeground: toHex(secondaryForeground),
accent: toHex(accent),
accentForeground: toHex(accentForeground),
accentText: toHex(
withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)
),
accentText: toHex(withMinContrast(accent, background, SECONDARY_MIN_CONTRAST)),
surface: toHex(mix(foreground, background, lightText ? 0.16 : 0.1)),
divider: toHex(mix(foreground, background, lightText ? 0.2 : 0.14)),
isDark: lightText,
@@ -96,10 +94,7 @@ function legibleBackground(color: Rgb, schemeIsDark: boolean): Rgb {
? withLightness(color, Math.min(lch.l, 0.86))
: withLightness(color, Math.max(lch.l, 0.2))
const y = luminance(clamped)
if (
y <= DARK_BACKGROUND_MAX_LUMINANCE ||
y >= LIGHT_BACKGROUND_MIN_LUMINANCE
) {
if (y <= DARK_BACKGROUND_MAX_LUMINANCE || y >= LIGHT_BACKGROUND_MIN_LUMINANCE) {
return clamped
}
@@ -130,10 +125,7 @@ function pickAccent(candidates: string[], background: Rgb): Rgb | null {
}
function prefersLightText(background: Rgb) {
return (
contrastRatio([255, 255, 255], background) >=
contrastRatio([0, 0, 0], background)
)
return contrastRatio([255, 255, 255], background) >= contrastRatio([0, 0, 0], background)
}
/** Moves `color`'s lightness away from `background` until it reaches `min`. */
@@ -188,10 +180,7 @@ function withLuminance(color: Rgb, target: number): Rgb {
high = mid
}
}
return withLightness(
color,
target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high
)
return withLightness(color, target <= DARK_BACKGROUND_MAX_LUMINANCE ? low : high)
}
/** `amount` of `color` over `base`. */
@@ -217,8 +206,7 @@ function toLinear(channel: number) {
}
function fromLinear(value: number) {
const c =
value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
const c = value <= 0.0031308 ? value * 12.92 : 1.055 * value ** (1 / 2.4) - 0.055
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"
function normalizeHostnameInput(input: string): string {
return input
.trim()
.replace(/^https?:\/\//i, "")
.replace(/\/+$/, "")
return input.trim().replace(/^https?:\/\//i, "").replace(/\/+$/, "")
}
function buildServerUrl(hostname: string): string {
+1 -4
View File
@@ -39,15 +39,12 @@ export function albumCoverUrl(
return sizedCoverUrl(`${serverUrl}/api/album/${albumId}/cover`, size)
}
/** `version` is the summary's `cover`; it changes with the artwork. */
export function playlistCoverUrl(
serverUrl: string,
playlistId: string,
version: string | null,
size?: CoverImageSize
) {
const uri = `${serverUrl}/api/playlist/${playlistId}/cover`
return sizedCoverUrl(version ? `${uri}?v=${version}` : uri, size)
return sizedCoverUrl(`${serverUrl}/api/playlist/${playlistId}/cover`, size)
}
export function songAudioSource(
+1 -117
View File
@@ -5,11 +5,7 @@ final class TabletSidebar: Module {
public func definition() -> ExpoModulesCore.ModuleDefinition {
Name("TabletSidebar")
View(TabletSidebarView.self) {
Events("onProfilePress", "onPlaylistPress")
Prop("playlists") { (view: TabletSidebarView, value: [SidebarPlaylist]) in
view.playlists = value
view.configure()
}
Events("onProfilePress")
Prop("accountName") { (view: TabletSidebarView, value: String) in
view.accountName = value
view.configure()
@@ -30,23 +26,9 @@ final class TabletSidebar: Module {
}
}
/// A playlist row under the sidebar's Playlists section.
struct SidebarPlaylist: Record {
@Field var id: String = ""
@Field var title: String = ""
/// Cover URL; changes whenever the artwork does. `nil` shows a list icon.
@Field var imageURL: String?
}
/// Adds UIKit sidebar features not yet exposed by Expo Router's native tabs.
final class TabletSidebarView: ExpoView {
let onProfilePress = EventDispatcher()
let onPlaylistPress = EventDispatcher()
var playlists: [SidebarPlaylist] = []
private let selectionProxy = SidebarSelectionProxy()
private var playlistTabs: [String: UITab] = [:]
private var coverImages: [String: UIImage] = [:]
private var coverTasks: [String: URLSessionDataTask] = [:]
var accountName = ""
var initials = ""
var imageURL: String?
@@ -100,13 +82,11 @@ final class TabletSidebarView: ExpoView {
deinit {
if let tabsObserver { NotificationCenter.default.removeObserver(tabsObserver) }
coverTasks.values.forEach { $0.cancel() }
}
@available(iOS 18.0, *)
private func configure(_ controller: UITabBarController) {
configureGroups(controller)
configurePlaylists(controller)
let footer: SidebarAccountButton
if let existing = controller.sidebar.bottomBarView as? SidebarAccountButton {
@@ -123,7 +103,6 @@ final class TabletSidebarView: ExpoView {
@available(iOS 18.0, *)
private func configureTabBar(_ controller: UITabBarController, footer: SidebarAccountButton) {
let destinations = controller.tabs.compactMap { $0 as? UITabGroup }.flatMap { $0.children }
.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let selected = destinations.first { $0 === controller.selectedTab }
let contextualTab = selected ?? footer.contextualTab ?? destinations.first
footer.contextualTab = contextualTab
@@ -181,101 +160,6 @@ final class TabletSidebarView: ExpoView {
}
}
private let playlistTabPrefix = "otunes.playlist."
private let playlistIconSize: CGFloat = 24
extension TabletSidebarView {
/// Lists each playlist under Playlists with its cover. Rows are never
/// selected natively: a tap opens the playlist in the All Playlists stack.
@available(iOS 18.0, *)
fileprivate func configurePlaylists(_ controller: UITabBarController) {
guard let group = controller.tabs.first(where: { $0.identifier == "otunes.playlists" })
as? UITabGroup else { return }
if !(controller.delegate is SidebarSelectionProxy) {
selectionProxy.original = controller.delegate
controller.delegate = selectionProxy
}
selectionProxy.onPlaylist = { [weak self] id in self?.onPlaylistPress(["id": id]) }
var rows: [UITab] = []
for playlist in playlists {
let identifier = playlistTabPrefix + playlist.id
let tab = playlistTabs[identifier] ?? UITab(
title: playlist.title, image: nil, identifier: identifier,
viewControllerProvider: { _ in UIViewController() })
playlistTabs[identifier] = tab
if tab.title != playlist.title { tab.title = playlist.title }
tab.preferredPlacement = .sidebarOnly
tab.image = playlistImage(identifier: identifier, url: playlist.imageURL)
rows.append(tab)
}
let ids = Set(rows.map(\.identifier))
playlistTabs = playlistTabs.filter { ids.contains($0.key) }
let fixed = group.children.filter { !$0.identifier.hasPrefix(playlistTabPrefix) }
let children = fixed + rows
if group.children.map(\.identifier) != children.map(\.identifier) {
group.children = children
}
}
/// The cached cover for `url`, starting a download on a miss.
@available(iOS 18.0, *)
private func playlistImage(identifier: String, url: String?) -> UIImage? {
let placeholder = UIImage(systemName: "music.note.list")
guard let url, let remote = URL(string: url) else { return placeholder }
if let image = coverImages[url] { return image }
if coverTasks[url] == nil {
let task = URLSession.shared.dataTask(with: remote) { [weak self] data, _, _ in
guard let data, let image = UIImage(data: data) else { return }
DispatchQueue.main.async {
guard let self else { return }
self.coverTasks[url] = nil
self.coverImages[url] = roundedIcon(image)
if let tab = self.playlistTabs[identifier] { tab.image = self.coverImages[url] }
}
}
coverTasks[url] = task
task.resume()
}
return placeholder
}
}
/// Square cover shrunk to sidebar icon size with rounded corners, drawn as is
/// rather than tinted like a symbol.
private func roundedIcon(_ image: UIImage) -> UIImage {
let size = CGSize(width: playlistIconSize, height: playlistIconSize)
let rendered = UIGraphicsImageRenderer(size: size).image { _ in
UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 4).addClip()
image.draw(in: CGRect(origin: .zero, size: size))
}
return rendered.withRenderingMode(.alwaysOriginal)
}
/// Sits in front of the router's tab controller delegate. Taps on playlist
/// rows go to JS; everything else is forwarded untouched.
private final class SidebarSelectionProxy: NSObject, UITabBarControllerDelegate {
weak var original: UITabBarControllerDelegate?
var onPlaylist: ((String) -> Void)?
override func responds(to aSelector: Selector!) -> Bool {
super.responds(to: aSelector) || (original?.responds(to: aSelector) ?? false)
}
override func forwardingTarget(for aSelector: Selector!) -> Any? { original }
@available(iOS 18.0, *)
func tabBarController(_ tabBarController: UITabBarController, shouldSelectTab tab: UITab) -> Bool {
if tab.identifier.hasPrefix(playlistTabPrefix) {
onPlaylist?(String(tab.identifier.dropFirst(playlistTabPrefix.count)))
return false
}
return original?.tabBarController?(tabBarController, shouldSelectTab: tab) ?? true
}
}
@available(iOS 18.0, *)
private final class SidebarAccountButton: UIView {
var onPress: (() -> Void)?
+1 -1
View File
@@ -32,7 +32,7 @@ export default function Page() {
<ContentCarousel
title="Recently Added"
href="/recently-added"
content={recentlyAdded.flat()}
content={recentlyAdded}
/>
</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={albumGridClassName}>
{albums.flat().map((album) => (
{albums.map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</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={albumGridClassName}>
{albums.flat().map((album) => (
{albums.map((album) => (
<AlbumCard key={album.id} album={album} />
))}
</div>
+5 -1
View File
@@ -8,7 +8,11 @@ import { albumGridClassName } from "@/lib/album-grid-classes"
import { api } from "@otunes/convex/_generated/api"
import type { BrowseAlbum, PlaylistSummary } from "@otunes/convex/types"
function RecentlyPlayedCard({ item }: { item: BrowseAlbum | PlaylistSummary }) {
function RecentlyPlayedCard({
item,
}: {
item: BrowseAlbum | PlaylistSummary
}) {
if ("owner" in 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 { SearchPrompt } from "@/components/search-prompt"
import { SearchSongItem } from "@/components/search-song-item"
import {
SearchTopResultCard,
type TopResult,
} from "@/components/search-top-result-card"
import { SearchTopResultCard, type TopResult } from "@/components/search-top-result-card"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { api } from "@otunes/convex/_generated/api"
@@ -110,7 +107,10 @@ function SearchResults({ query }: { query: string }) {
)}
{showPlaylists && (
<ContentCarousel title="Playlists" content={playlistResults ?? []} />
<ContentCarousel
title="Playlists"
content={playlistResults ?? []}
/>
)}
</div>
</div>
+6 -11
View File
@@ -1,23 +1,18 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
import { serveCoverFile, serveStoredCover } from "@/lib/serve-cover"
import { getConvexClient } from "@/lib/convex-server"
import { serveCoverFile } from "@/lib/serve-cover"
/** Playlist artwork, drawn or uploaded ahead of time into Convex storage. */
export async function GET(
request: Request,
{ params }: { params: Promise<{ id: string }> }
) {
const { id } = await params
try {
const storageUrl = await getConvexClient().query(
api.library.getPlaylistCover,
{ id: id as Id<"playlists"> }
)
const image = storageUrl ? await fetchConvexStorageFile(storageUrl) : null
return image
? await serveStoredCover(image, request)
: await serveCoverFile(null, request)
const cover = await getConvexClient().query(api.library.getPlaylistCover, {
id: id as Id<"playlists">,
})
return serveCoverFile(cover, request)
} catch {
return new Response("Not found", { status: 404 })
}
+9 -4
View File
@@ -1,7 +1,7 @@
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import sharp from "sharp"
import { fetchConvexStorageFile, getConvexClient } from "@/lib/convex-server"
import { getConvexClient, getConvexServerUrl } from "@/lib/convex-server"
const AVATAR_SIZE = 256
@@ -24,12 +24,17 @@ export async function GET(
return new Response("Not found", { status: 404 })
}
const image = await fetchConvexStorageFile(storageUrl)
if (!image) {
// The backend builds storage URLs from its public origin, which may not
// be reachable from here. Fetch the same path from the internal URL.
const { pathname, search } = new URL(storageUrl)
const upstream = await fetch(
new URL(pathname + search, getConvexServerUrl())
)
if (!upstream.ok) {
return new Response("Not found", { status: 404 })
}
const data = await sharp(image)
const data = await sharp(Buffer.from(await upstream.arrayBuffer()))
.rotate()
.resize(AVATAR_SIZE, AVATAR_SIZE, {
fit: "cover",
@@ -42,9 +42,7 @@ function formatAddToPlaylistToast(
}
const addedLabel =
addedCount > 1
? `Added ${addedCount} songs to ${title}`
: `Added to ${title}`
addedCount > 1 ? `Added ${addedCount} songs to ${title}` : `Added to ${title}`
if (skippedCount === 0) {
return addedLabel
@@ -66,15 +64,14 @@ type AddToPlaylistContextValue = {
openCreatePlaylist: () => void
}
const AddToPlaylistContext =
React.createContext<AddToPlaylistContextValue | null>(null)
const AddToPlaylistContext = React.createContext<AddToPlaylistContextValue | null>(
null
)
export function useAddToPlaylist() {
const context = React.useContext(AddToPlaylistContext)
if (!context) {
throw new Error(
"useAddToPlaylist must be used within AddToPlaylistProvider"
)
throw new Error("useAddToPlaylist must be used within AddToPlaylistProvider")
}
return context
}
@@ -184,7 +181,7 @@ export function AddToPlaylistProvider({
}
)
if (requestId === selectionRequestRef.current) {
showAddToPlaylist(songIds.flat())
showAddToPlaylist(songIds)
}
} catch (error) {
if (requestId === selectionRequestRef.current) {
@@ -204,10 +201,7 @@ export function AddToPlaylistProvider({
setCreateOpen(true)
}, [])
async function handleAddToPlaylist(
playlistId: Id<"playlists">,
title: string
) {
async function handleAddToPlaylist(playlistId: Id<"playlists">, title: string) {
setIsSubmitting(true)
try {
const { addedCount, skippedCount } = await addSongs({
+7 -2
View File
@@ -104,7 +104,10 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
onMouseEnter={() => setHovered(true)}
onMouseLeave={() => setHovered(false)}
>
<Link className="absolute inset-0" href={"/album/" + album.id}>
<Link
className="absolute inset-0"
href={"/album/" + album.id}
>
<Image
src={albumCoverUrl(album.id)}
alt={album.title}
@@ -173,7 +176,9 @@ export function AlbumCard({ album }: { album: BrowseAlbum }) {
href={"/artist/" + album.artist.id}
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>
</div>
</div>
+6 -21
View File
@@ -44,10 +44,7 @@ import { albumCoverUrl } from "@/lib/cover-urls"
import { sumDurationSeconds } from "@/lib/media-summary"
import { albumDetailSongs, rememberSongs } from "@/lib/song-cache"
function formatMetadata(
genre: string | null,
year: number | null
): string | null {
function formatMetadata(genre: string | null, year: number | null): string | null {
const parts: string[] = []
if (genre) {
parts.push(genre)
@@ -63,9 +60,7 @@ type AlbumTrackSection = {
tracks: BrowseAlbumTrack[]
}
function groupAlbumTracksByDisk(
tracks: BrowseAlbumTrack[]
): AlbumTrackSection[] {
function groupAlbumTracksByDisk(tracks: BrowseAlbumTrack[]): AlbumTrackSection[] {
const hasDiskNumbers = tracks.some((track) => track.diskNumber !== null)
if (!hasDiskNumbers) {
return [{ label: null, tracks }]
@@ -143,11 +138,7 @@ export function AlbumView({
} = useTrackSelection(album.tracks, validHighlightedSongId)
const selectionPositions = React.useMemo(
() =>
getSelectionRangePositions(
album.tracks.map((track) => track.id),
selectedIds
),
() => getSelectionRangePositions(album.tracks.map((track) => track.id), selectedIds),
[album.tracks, selectedIds]
)
@@ -201,11 +192,7 @@ export function AlbumView({
const handleRowPlay = React.useCallback(
(index: number) => {
void playFromSong(
album.tracks[index].id,
albumSongIds,
`album:${album.id}`
)
void playFromSong(album.tracks[index].id, albumSongIds, `album:${album.id}`)
},
[album.tracks, album.id, albumSongIds, playFromSong]
)
@@ -228,7 +215,7 @@ export function AlbumView({
<PageHeader openApp />
<ScrollArea className="min-h-0 flex-1 [&_[data-slot=scroll-area-viewport]>div]:block!">
<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="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
@@ -358,9 +345,7 @@ export function AlbumView({
song={trackSongs.get(track.id)!}
index={listIndex}
trackNumber={
track.track > 0
? track.track
: sectionTrackIndex + 1
track.track > 0 ? track.track : sectionTrackIndex + 1
}
subtitle={track.artists?.join(", ")}
isActive={track.id === activeTrackId}
+10 -22
View File
@@ -43,7 +43,6 @@ import Link from "next/link"
import { useTheme } from "next-themes"
import * as React from "react"
import { api } from "@otunes/convex/_generated/api"
import { playlistCoverUrl } from "@/lib/cover-urls"
import { useCachedQuery } from "@/hooks/use-cached-query"
import { useMounted } from "@/hooks/use-mounted"
import { clearPersistentCache } from "@/lib/persistent-cache"
@@ -87,28 +86,17 @@ export function AppSidebar() {
const isDark = mounted && resolvedTheme === "dark"
const playlistNav = [
{
title: "All Playlists",
path: "/playlists",
icon: <LayoutGrid />,
},
{ title: "Favorites", path: "/playlist/favorites", icon: <Star /> },
...[
...(sidebarPlaylists?.owned ?? []),
...(sidebarPlaylists?.subscribed ?? []),
].map((playlist) => ({
{ title: "All Playlists", path: "/playlists", icon: LayoutGrid },
{ title: "Favorites", path: "/playlist/favorites", icon: Star },
...(sidebarPlaylists?.owned ?? []).map((playlist) => ({
title: playlist.title,
path: `/playlist/${playlist.id}`,
icon: playlist.cover ? (
// eslint-disable-next-line @next/next/no-img-element -- versioned cover, already sized by the route
<img
src={playlistCoverUrl(playlist.id, playlist.cover, 64)}
alt=""
className="size-4 shrink-0 rounded-[3px] object-cover"
/>
) : (
<ListMusic />
),
icon: ListMusic,
})),
...(sidebarPlaylists?.subscribed ?? []).map((playlist) => ({
title: playlist.title,
path: `/playlist/${playlist.id}`,
icon: ListMusic,
})),
]
@@ -177,7 +165,7 @@ export function AppSidebar() {
<SidebarMenuItem key={item.path}>
<SidebarMenuButton isActive={pathname === item.path} asChild>
<Link href={item.path} onClick={() => setOpenMobile(false)}>
{item.icon}
<item.icon />
<span>{item.title}</span>
</Link>
</SidebarMenuButton>
+2 -2
View File
@@ -32,8 +32,8 @@ export function ArtistsPage() {
<ArtistsSkeleton />
) : (
<ArtistsView
artists={artists.flat()}
albums={albums.flat()}
artists={artists}
albums={albums}
artistId={artistIdFromPathname(pathname)}
onSelectArtist={selectArtist}
/>
+54 -59
View File
@@ -13,12 +13,7 @@ import {
CardHeader,
CardTitle,
} from "@/components/ui/card"
import {
Field,
FieldError,
FieldGroup,
FieldLabel,
} from "@/components/ui/field"
import { Field, FieldError, FieldGroup, FieldLabel } from "@/components/ui/field"
import { Input } from "@/components/ui/input"
import { Spinner } from "@/components/ui/spinner"
@@ -106,64 +101,64 @@ export function AuthForm({
administrator if you need access.
</p>
) : (
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<Field>
<FieldLabel htmlFor="name">Name</FieldLabel>
<Input
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
required
/>
</Field>
)}
<form onSubmit={handleSubmit}>
<FieldGroup>
{flow === "signUp" && (
<Field>
<FieldLabel htmlFor="email">Email</FieldLabel>
<FieldLabel htmlFor="name">Name</FieldLabel>
<Input
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
id="name"
name="name"
type="text"
autoComplete="name"
placeholder="Ada Lovelace"
required
/>
</Field>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!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>
)}
<Field>
<FieldLabel htmlFor="email">Email</FieldLabel>
<Input
id="email"
name="email"
type="email"
autoComplete="email"
placeholder="you@example.com"
required
/>
</Field>
<Field>
<FieldLabel htmlFor="password">Password</FieldLabel>
<Input
id="password"
name="password"
type="password"
autoComplete={
flow === "signIn" ? "current-password" : "new-password"
}
required
/>
</Field>
{error && <FieldError>{error}</FieldError>}
<Field>
<Button type="submit" disabled={submitting}>
{submitting && <Spinner />}
{text.submit}
</Button>
</Field>
{!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>
</Card>
@@ -39,7 +39,6 @@ export function ConvexClientProvider({
}) {
return (
<ConvexAuthNextjsProvider client={getConvexClient(convexUrl)}>
<PersistentCacheProvider>{children}</PersistentCacheProvider>{" "}
</ConvexAuthNextjsProvider>
<PersistentCacheProvider>{children}</PersistentCacheProvider> </ConvexAuthNextjsProvider>
)
}
@@ -29,7 +29,7 @@ export function FavoriteMediaButton({
className={cn(
"rounded-full",
!isFavorite &&
"hover:border-transparent hover:bg-primary hover:text-primary-foreground",
"hover:bg-primary hover:text-primary-foreground hover:border-transparent",
className
)}
aria-label={isFavorite ? favoritedLabel : unfavoritedLabel}
+3 -3
View File
@@ -86,15 +86,15 @@ export function FavoritesProvider({ children }: { children: React.ReactNode }) {
)
const songIds = React.useMemo(
() => new Set<string>(favorites?.favoriteSongs.flat()),
() => new Set(favorites?.favoriteSongs.map(String) ?? []),
[favorites?.favoriteSongs]
)
const albumIds = React.useMemo(
() => new Set<string>(favorites?.favoriteAlbums.flat()),
() => new Set(favorites?.favoriteAlbums.map(String) ?? []),
[favorites?.favoriteAlbums]
)
const artistIds = React.useMemo(
() => new Set<string>(favorites?.favoriteArtists.flat()),
() => new Set(favorites?.favoriteArtists.map(String) ?? []),
[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"
export function MediaCollectionFooter({
+11 -6
View File
@@ -1,7 +1,12 @@
"use client"
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 { toast } from "sonner"
@@ -43,7 +48,7 @@ import { usePlayback } from "@/components/playback-provider"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import type { PlaybackQuality } from "@otunes/convex/playback-stream"
import { resizeProfileImageToDataUrl } from "@/lib/resize-image"
import { resizeProfileImageToDataUrl } from "@/lib/resize-profile-image"
import { cn } from "@/lib/utils"
type Section = "profile" | "quality" | "users" | "library"
@@ -148,7 +153,9 @@ function UserAvatar({
key={user.image ?? "fallback"}
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>
</Avatar>
)
@@ -684,9 +691,7 @@ function UserRowActions({
setAdmin({ userId: user._id, isAdmin: !user.isAdmin })
.then(() =>
toast.success(
user.isAdmin
? "Admin access removed"
: "User is now admin"
user.isAdmin ? "Admin access removed" : "User is now admin"
)
)
.catch((error: Error) => toast.error(error.message))
+34 -36
View File
@@ -341,7 +341,9 @@ export function useIsPlaying() {
export function usePlaybackProgress() {
const context = useContext(PlaybackProgressContext)
if (!context) {
throw new Error("usePlaybackProgress must be used within PlaybackProvider")
throw new Error(
"usePlaybackProgress must be used within PlaybackProvider"
)
}
return context
}
@@ -364,11 +366,11 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
api.playback.getPlaybackState,
isSignedIn ? {} : "skip"
)
const syncPlaybackStateMutation = useMutation(api.playback.syncPlaybackState)
const recordPlayMutation = useMutation(api.playback.recordPlay)
const updateSongProgressMutation = useMutation(
api.playback.updateSongProgress
const syncPlaybackStateMutation = useMutation(
api.playback.syncPlaybackState
)
const recordPlayMutation = useMutation(api.playback.recordPlay)
const updateSongProgressMutation = useMutation(api.playback.updateSongProgress)
useEffect(() => {
if (!isSignedIn) {
@@ -476,27 +478,31 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
const isPlaybackActive = Boolean(currentSongId && isPlaying)
const repeatEnabled = playback.repeatEnabled
const queueLength = queueSongIds.length
const nextQueueSongId = queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongId =
queueSongIds.length > 1 ? queueSongIds[1] : null
const nextQueueSongDoc = useCachedQuery(
api.library.getSongPlaybackInfo,
nextQueueSongId ? { id: nextQueueSongId } : "skip"
)
const seekTo = useCallback((seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const seekTo = useCallback(
(seconds: number) => {
const audio = audioRef.current
if (!audio) {
return
}
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
}, [])
const maxDuration =
Number.isFinite(audio.duration) && audio.duration > 0
? audio.duration
: durationRef.current
const clamped = Math.max(0, Math.min(seconds, maxDuration || 0))
audio.currentTime = clamped
currentTimeRef.current = clamped
setCurrentTime(clamped)
},
[]
)
const saveProgress = useCallback(
(seconds: number) => {
@@ -949,13 +955,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
}
const preloadAudio = preloadAudioRef.current
if (
shouldContinuePlaying &&
preloadAudio &&
nextQueueSongId &&
user &&
nextQueueSongDoc
) {
if (shouldContinuePlaying && preloadAudio && nextQueueSongId && user && nextQueueSongDoc) {
const settings = playbackLoadSettings(
user,
dolbyAtmosSupported,
@@ -1233,14 +1233,12 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
let songIds: Id<"songs">[]
try {
songIds = (
await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
).flat()
songIds = await fetchCachedQuery(
convex,
cacheScope,
api.library.browseSortedSongIds,
sort
)
} catch {
return
}
@@ -1270,7 +1268,7 @@ export function PlaybackProvider({ children }: { children: ReactNode }) {
cacheScope,
api.playlists.getOrderedArtistSongIds,
{ artistId }
).then((chunks) => chunks.flat()),
),
[convex, cacheScope]
)
+2 -2
View File
@@ -62,10 +62,10 @@ export function PlaylistCard({ playlist }: { playlist: PlaylistSummary }) {
<div className="group relative aspect-square overflow-hidden rounded-lg ring-1 ring-foreground/10">
<Link className="absolute inset-0" href={"/playlist/" + playlist.id}>
<Image
src={playlistCoverUrl(playlist.id, playlist.cover, 384)}
src={playlistCoverUrl(playlist.id)}
alt={playlist.title}
fill
unoptimized
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 25vw, 16vw"
className="object-cover"
/>
</Link>
@@ -1,215 +0,0 @@
"use client"
import * as React from "react"
import Image from "next/image"
import { useMutation } from "convex/react"
import { ArrowUp, Shuffle } from "lucide-react"
import { toast } from "sonner"
import { Button } from "@/components/ui/button"
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog"
import { albumCoverUrl, playlistCoverUrl } from "@/lib/cover-urls"
import { resizeImageToDataUrl } from "@/lib/resize-image"
import { cn } from "@/lib/utils"
import { api } from "@otunes/convex/_generated/api"
import type { Id } from "@otunes/convex/_generated/dataModel"
import {
COVER_GRID_ALBUMS,
playlistCoverAlbums,
randomPlaylistCovers,
} from "@otunes/convex/client/playlist-cover"
import type { BrowseSong } from "@otunes/convex/types"
const UPLOAD_SIZE = 1024
/**
* Lets a playlist owner pick generated artwork (random 2x2 grids of the
* playlist's albums, reshuffled on demand) or upload an image. The current
* cover sits apart from the options so the owner can always keep it.
*/
export function PlaylistCoverDialog({
open,
onOpenChange,
playlistId,
title,
coverVersion,
songs,
}: {
open: boolean
onOpenChange: (open: boolean) => void
playlistId: Id<"playlists">
title: string
coverVersion: string | null
songs: BrowseSong[]
}) {
const setCoverAlbums = useMutation(api.playlists.setPlaylistCoverAlbums)
const uploadCover = useMutation(api.playlists.uploadPlaylistCover)
const fileInputRef = React.useRef<HTMLInputElement>(null)
const albums = React.useMemo(() => playlistCoverAlbums(songs), [songs])
const [options, setOptions] = React.useState<Id<"albums">[][]>([])
const canShuffle = albums.length >= COVER_GRID_ALBUMS
function shuffle() {
setOptions(randomPlaylistCovers(albums))
}
// Fresh options each time the dialog opens.
const [wasOpen, setWasOpen] = React.useState(false)
if (open !== wasOpen) {
setWasOpen(open)
if (open) shuffle()
}
async function pick(albumIds: Id<"albums">[]) {
onOpenChange(false)
try {
await setCoverAlbums({ playlistId, albumIds })
} catch (error) {
toast.error(
error instanceof Error ? error.message : "Failed to change cover"
)
}
}
async function upload(file: File) {
if (!file.type.startsWith("image/")) {
toast.error("Choose an image file")
return
}
onOpenChange(false)
try {
const image = await resizeImageToDataUrl(file, UPLOAD_SIZE)
await uploadCover({ playlistId, image })
} catch (error) {
toast.error(
error instanceof Error ? error.message : "Failed to upload cover"
)
}
}
return (
<Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent className="sm:max-w-xl">
<DialogHeader>
<DialogTitle>Playlist Cover</DialogTitle>
</DialogHeader>
<div className="flex items-stretch gap-3">
{coverVersion ? (
<>
<CoverButton
label="Keep current cover"
selected
onClick={() => onOpenChange(false)}
>
<Image
src={playlistCoverUrl(playlistId, coverVersion, 256)}
alt={title}
fill
unoptimized
className="object-cover"
/>
</CoverButton>
<div className="w-px shrink-0 bg-border" />
</>
) : null}
<div className="grid flex-[4] grid-cols-4 gap-3">
{options.map((albumIds) => (
<CoverButton
key={albumIds.join(",")}
label="Use this cover"
onClick={() => void pick(albumIds)}
>
<AlbumGrid albumIds={albumIds} />
</CoverButton>
))}
</div>
</div>
{albums.length === 0 ? (
<p className="text-sm text-muted-foreground">
No album artwork in this playlist yet.
</p>
) : null}
<div className="flex gap-2">
{canShuffle ? (
<Button variant="secondary" onClick={shuffle}>
<Shuffle />
Shuffle
</Button>
) : null}
<Button
variant="secondary"
onClick={() => fileInputRef.current?.click()}
>
<ArrowUp />
Upload Image
</Button>
<input
ref={fileInputRef}
type="file"
accept="image/*"
className="hidden"
onChange={(event) => {
const file = event.target.files?.[0]
event.target.value = ""
if (file) void upload(file)
}}
/>
</div>
</DialogContent>
</Dialog>
)
}
function CoverButton({
label,
selected = false,
onClick,
children,
}: {
label: string
selected?: boolean
onClick: () => void
children: React.ReactNode
}) {
return (
<button
type="button"
aria-label={label}
onClick={onClick}
className={cn(
"relative aspect-square min-w-0 flex-1 overflow-hidden rounded-md ring-offset-2 ring-offset-background transition-shadow outline-none hover:ring-2 hover:ring-foreground/60 focus-visible:ring-2 focus-visible:ring-ring",
selected && "ring-2 ring-foreground hover:ring-foreground"
)}
>
{children}
</button>
)
}
/** Preview of a generated cover: one album alone, or four tiled 2x2. */
function AlbumGrid({ albumIds }: { albumIds: Id<"albums">[] }) {
const grid = albumIds.length > 1
return (
<div className={cn("grid size-full", grid && "grid-cols-2")}>
{albumIds.map((albumId) => (
<div key={albumId} className="relative">
<Image
src={albumCoverUrl(albumId)}
alt=""
fill
sizes={grid ? "64px" : "128px"}
className="object-cover"
/>
</div>
))}
</div>
)
}
+1 -3
View File
@@ -34,7 +34,5 @@ export function FavoritesPlaylistPage() {
return <PageMessage>Sign in to view your favorites.</PageMessage>
}
return (
<PlaylistView playlist={{ ...favorites, songs: favorites.songs.flat() }} />
)
return <PlaylistView playlist={favorites} />
}
+4 -44
View File
@@ -6,16 +6,7 @@ import * as React from "react"
import Image from "next/image"
import { useRouter } from "next/navigation"
import { useMutation } from "convex/react"
import {
ImageIcon,
Pencil,
Play,
SearchIcon,
Share2,
Shuffle,
Star,
Trash2,
} from "lucide-react"
import { Play, SearchIcon, Share2, Shuffle, Star, Trash2 } from "lucide-react"
import { toast } from "sonner"
import { useFavorites } from "@/components/favorites-provider"
@@ -24,7 +15,6 @@ import {
usePlaybackActions,
} from "@/components/playback-provider"
import { MediaCollectionFooter } from "@/components/media-collection-footer"
import { PlaylistCoverDialog } from "@/components/playlist-cover-dialog"
import {
MediaContextMenu,
type MediaContextAction,
@@ -107,8 +97,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
const [dragIndex, setDragIndex] = React.useState<number | null>(null)
const [isSubscribed, setIsSubscribed] = React.useState(playlist.isSubscribed)
const [subscriptionPending, setSubscriptionPending] = React.useState(false)
const [coverDialogOpen, setCoverDialogOpen] = React.useState(false)
const canEditCover = isOwner && !isFavorites && playlist.id !== null
if (syncedPlaylist !== playlist) {
setSyncedPlaylist(playlist)
@@ -303,32 +291,21 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
<div className="pb-28">
<div className="mx-auto w-full max-w-9/10 min-w-0">
<div className="flex flex-col gap-8 px-6 pt-6 pb-8 sm:flex-row sm:items-end">
<div className="group 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">
{isFavorites ? (
<div className="flex size-full items-center justify-center bg-muted">
<Star className="size-16 fill-primary text-primary" />
</div>
) : (
<Image
src={playlistCoverUrl(playlist.id!, playlist.cover, 512)}
src={playlistCoverUrl(playlist.id!)}
alt={playlist.title}
fill
unoptimized
sizes="240px"
className="object-cover"
preload
/>
)}
{canEditCover ? (
<Button
variant="secondary"
size="icon"
className="absolute right-2 bottom-2 rounded-full opacity-0 shadow-md transition-opacity group-hover:opacity-100 focus-visible:opacity-100"
aria-label="Change cover"
onClick={() => setCoverDialogOpen(true)}
>
<Pencil />
</Button>
) : null}
</div>
<div className="flex min-w-0 flex-1 flex-col gap-4">
@@ -408,13 +385,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
{isOwner && !isFavorites ? (
<>
<DropdownMenuSeparator />
<DropdownMenuItem
className="justify-between"
onClick={() => setCoverDialogOpen(true)}
>
Change Cover
<ImageIcon />
</DropdownMenuItem>
<DropdownMenuItem
variant="destructive"
className="justify-between"
@@ -506,16 +476,6 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
</div>
</div>
</ScrollArea>
{canEditCover ? (
<PlaylistCoverDialog
open={coverDialogOpen}
onOpenChange={setCoverDialogOpen}
playlistId={playlist.id!}
title={playlist.title}
coverVersion={playlist.cover}
songs={songs}
/>
) : null}
</div>
)
}
+3 -10
View File
@@ -66,7 +66,7 @@ function HistorySongRow({ song }: { song: HistorySong }) {
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)}
</span>
</div>
@@ -218,11 +218,7 @@ export function QueuePanel() {
(index) => selectableQueue[index].queueIndex
)
const targetQueueIndex = selectableQueue[targetLocalIndex].queueIndex
const next = moveQueueBlock(
queueSongIds,
fromQueueIndices,
targetQueueIndex
)
const next = moveQueueBlock(queueSongIds, fromQueueIndices, targetQueueIndex)
setDragIndex(null)
@@ -267,10 +263,7 @@ export function QueuePanel() {
{historySongs.length > 0 ? (
<ul className="flex flex-col border-b py-1">
{historySongs.map((song) => (
<HistorySongRow
key={`history-${song.id}-${song.historyIndex}`}
song={song}
/>
<HistorySongRow key={`history-${song.id}-${song.historyIndex}`} song={song} />
))}
</ul>
) : null}
+2 -1
View File
@@ -50,7 +50,8 @@ export function SongsView() {
const { isSongFavorite, toggleSongFavorite } = useFavorites()
const { playFromLibrarySong } = usePlaybackActions()
const [sortKey, setSortKey] = useState<SortKey>("title")
const [sortDirection, setSortDirection] = useState<SortDirection>("asc")
const [sortDirection, setSortDirection] =
useState<SortDirection>("asc")
const loadMoreRef = useRef<HTMLDivElement>(null)
const { results, status, loadMore, isCached } = useCachedPaginatedQuery(
+2 -1
View File
@@ -29,7 +29,8 @@ function ThemeFavicon() {
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) {
let link = document.querySelector<HTMLLinkElement>(`link[rel="${rel}"]`)
+9 -31
View File
@@ -155,9 +155,7 @@ function FavoriteStarButton({
: "text-primary hover:text-primary",
className
)}
aria-label={
isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`
}
aria-label={isFavorite ? `Remove ${title} from favorites` : `Favorite ${title}`}
onClick={(event) => {
event.stopPropagation()
onToggle()
@@ -177,7 +175,7 @@ function ExplicitBadge({ inRange }: { inRange: boolean }) {
return (
<span
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
? "bg-white/20 text-primary-foreground"
: "bg-muted-foreground/20 text-muted-foreground"
@@ -221,13 +219,7 @@ function TrackTitle({
export function LibraryTrackListHeader() {
const labelClass = "text-xs text-muted-foreground"
return (
<div
className={cn(
"flex h-9 items-center",
LIBRARY_ROW_LAYOUT,
TRACK_ROW_PADDING
)}
>
<div className={cn("flex h-9 items-center", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
<span aria-hidden />
<span aria-hidden />
@@ -354,16 +346,10 @@ function TrackRowComponent({
? "text-primary-foreground hover:text-primary-foreground/80 hover:underline"
: "text-muted-foreground hover:text-foreground hover:underline"
content = (
<div
className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}
>
<div className={cn("relative z-10", LIBRARY_ROW_LAYOUT, TRACK_ROW_PADDING)}>
<div className={LIBRARY_NAME_COLUMNS}>
{favoriteStar}
<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 transition-colors group-hover:bg-black/40">
<Button
size="icon-sm"
@@ -408,9 +394,7 @@ function TrackRowComponent({
}
case "album":
content = (
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
{favoriteStar}
{trackNumberButton}
<TrackTitle song={song} subtitle={subtitle} inRange={inRange} />
@@ -421,14 +405,8 @@ function TrackRowComponent({
break
case "playlist":
content = (
<div
className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}
>
<TrackCover
albumId={song.album.id}
alt={song.album.title}
inRange={inRange}
>
<div className={cn("relative z-10", ALBUM_TRACK_ROW, TRACK_ROW_PADDING)}>
<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">
<FavoriteStarButton
title={song.title}
@@ -499,7 +477,7 @@ function TrackRowComponent({
}
},
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",
inRange && "text-primary-foreground",
isDragging && "opacity-50"
+2 -8
View File
@@ -48,14 +48,8 @@ function AccordionTrigger({
{...props}
>
{children}
<ChevronDownIcon
data-slot="accordion-trigger-icon"
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"
/>
<ChevronDownIcon data-slot="accordion-trigger-icon" 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.Header>
)
+5 -2
View File
@@ -82,7 +82,9 @@ function BreadcrumbSeparator({
className={cn("[&>svg]:size-3.5", className)}
{...props}
>
{children ?? <ChevronRightIcon />}
{children ?? (
<ChevronRightIcon />
)}
</li>
)
}
@@ -102,7 +104,8 @@ function BreadcrumbEllipsis({
)}
{...props}
>
<MoreHorizontalIcon />
<MoreHorizontalIcon
/>
<span className="sr-only">More</span>
</span>
)
+2 -9
View File
@@ -10,11 +10,7 @@ import {
import { cn } from "@/lib/utils"
import { Button, buttonVariants } from "@/components/ui/button"
import {
ChevronLeftIcon,
ChevronRightIcon,
ChevronDownIcon,
} from "lucide-react"
import { ChevronLeftIcon, ChevronRightIcon, ChevronDownIcon } from "lucide-react"
function Calendar({
className,
@@ -157,10 +153,7 @@ function Calendar({
if (orientation === "right") {
return (
<ChevronRightIcon
className={cn("size-4", className)}
{...props}
/>
<ChevronRightIcon className={cn("size-4", className)} {...props} />
)
}
+2 -1
View File
@@ -23,7 +23,8 @@ function Checkbox({
data-slot="checkbox-indicator"
className="grid place-content-center text-current transition-none [&>svg]:size-3.5"
>
<CheckIcon />
<CheckIcon
/>
</CheckboxPrimitive.Indicator>
</CheckboxPrimitive.Root>
)
+1 -4
View File
@@ -112,10 +112,7 @@ function ComboboxContent({
<ComboboxPrimitive.Popup
data-slot="combobox-content"
data-chips={!!anchor}
className={cn(
"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
)}
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 )}
{...props}
/>
</ComboboxPrimitive.Positioner>
+4 -1
View File
@@ -11,7 +11,10 @@ import {
DialogHeader,
DialogTitle,
} 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"
function Command({
+6 -10
View File
@@ -68,10 +68,7 @@ function ContextMenuContent({
<ContextMenuPrimitive.Portal>
<ContextMenuPrimitive.Content
data-slot="context-menu-content"
className={cn(
"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
)}
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 )}
{...props}
/>
</ContextMenuPrimitive.Portal>
@@ -132,10 +129,7 @@ function ContextMenuSubContent({
return (
<ContextMenuPrimitive.SubContent
data-slot="context-menu-sub-content"
className={cn(
"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
)}
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 )}
{...props}
/>
)
@@ -163,7 +157,8 @@ function ContextMenuCheckboxItem({
>
<span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</ContextMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -191,7 +186,8 @@ function ContextMenuRadioItem({
>
<span className="pointer-events-none absolute right-2">
<ContextMenuPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</ContextMenuPrimitive.ItemIndicator>
</span>
{children}
+2 -1
View File
@@ -74,7 +74,8 @@ function DialogContent({
className="absolute top-2 right-2"
size="icon-sm"
>
<XIcon />
<XIcon
/>
<span className="sr-only">Close</span>
</Button>
</DialogPrimitive.Close>
+6 -10
View File
@@ -43,10 +43,7 @@ function DropdownMenuContent({
data-slot="dropdown-menu-content"
sideOffset={sideOffset}
align={align}
className={cn(
"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
)}
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 )}
{...props}
/>
</DropdownMenuPrimitive.Portal>
@@ -109,7 +106,8 @@ function DropdownMenuCheckboxItem({
data-slot="dropdown-menu-checkbox-item-indicator"
>
<DropdownMenuPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -151,7 +149,8 @@ function DropdownMenuRadioItem({
data-slot="dropdown-menu-radio-item-indicator"
>
<DropdownMenuPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</DropdownMenuPrimitive.ItemIndicator>
</span>
{children}
@@ -245,10 +244,7 @@ function DropdownMenuSubContent({
return (
<DropdownMenuPrimitive.SubContent
data-slot="dropdown-menu-sub-content"
className={cn(
"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
)}
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 )}
{...props}
/>
)
+2 -1
View File
@@ -78,7 +78,8 @@ function InputOTPSeparator({ ...props }: React.ComponentProps<"div">) {
role="separator"
{...props}
>
<MinusIcon />
<MinusIcon
/>
</div>
)
}
+6 -10
View File
@@ -78,10 +78,7 @@ function MenubarContent({
align={align}
alignOffset={alignOffset}
sideOffset={sideOffset}
className={cn(
"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
)}
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 )}
{...props}
/>
</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">
<MenubarPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</MenubarPrimitive.ItemIndicator>
</span>
{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">
<MenubarPrimitive.ItemIndicator>
<CheckIcon />
<CheckIcon
/>
</MenubarPrimitive.ItemIndicator>
</span>
{children}
@@ -255,10 +254,7 @@ function MenubarSubContent({
return (
<MenubarPrimitive.SubContent
data-slot="menubar-sub-content"
className={cn(
"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
)}
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 )}
{...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"
{...props}
/>
<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"
/>
<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" />
</div>
)
}
+1 -4
View File
@@ -74,10 +74,7 @@ function NavigationMenuTrigger({
{...props}
>
{children}{" "}
<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"
/>
<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" />
</NavigationMenuPrimitive.Trigger>
)
}
+3 -6
View File
@@ -2,11 +2,7 @@ import * as React from "react"
import { cn } from "@/lib/utils"
import { Button } from "@/components/ui/button"
import {
ChevronLeftIcon,
ChevronRightIcon,
MoreHorizontalIcon,
} from "lucide-react"
import { ChevronLeftIcon, ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
function Pagination({ className, ...props }: React.ComponentProps<"nav">) {
return (
@@ -115,7 +111,8 @@ function PaginationEllipsis({
)}
{...props}
>
<MoreHorizontalIcon />
<MoreHorizontalIcon
/>
<span className="sr-only">More pages</span>
</span>
)
+5 -8
View File
@@ -69,12 +69,7 @@ function SelectContent({
<SelectPrimitive.Content
data-slot="select-content"
data-align-trigger={position === "item-aligned"}
className={cn(
"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
)}
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 )}
position={position}
align={align}
{...props}
@@ -158,7 +153,8 @@ function SelectScrollUpButton({
)}
{...props}
>
<ChevronUpIcon />
<ChevronUpIcon
/>
</SelectPrimitive.ScrollUpButton>
)
}
@@ -176,7 +172,8 @@ function SelectScrollDownButton({
)}
{...props}
>
<ChevronDownIcon />
<ChevronDownIcon
/>
</SelectPrimitive.ScrollDownButton>
)
}
+2 -1
View File
@@ -75,7 +75,8 @@ function SheetContent({
className="absolute top-3 right-3"
size="icon-sm"
>
<XIcon />
<XIcon
/>
<span className="sr-only">Close</span>
</Button>
</SheetPrimitive.Close>
+16 -12
View File
@@ -2,13 +2,7 @@
import { useTheme } from "next-themes"
import { Toaster as Sonner, type ToasterProps } from "sonner"
import {
CircleCheckIcon,
InfoIcon,
TriangleAlertIcon,
OctagonXIcon,
Loader2Icon,
} from "lucide-react"
import { CircleCheckIcon, InfoIcon, TriangleAlertIcon, OctagonXIcon, Loader2Icon } from "lucide-react"
const Toaster = ({ ...props }: ToasterProps) => {
const { theme = "system" } = useTheme()
@@ -19,11 +13,21 @@ const Toaster = ({ ...props }: ToasterProps) => {
theme={theme as ToasterProps["theme"]}
className="toaster group"
icons={{
success: <CircleCheckIcon className="size-4" />,
info: <InfoIcon className="size-4" />,
warning: <TriangleAlertIcon className="size-4" />,
error: <OctagonXIcon className="size-4" />,
loading: <Loader2Icon className="size-4 animate-spin" />,
success: (
<CircleCheckIcon className="size-4" />
),
info: (
<InfoIcon className="size-4" />
),
warning: (
<TriangleAlertIcon className="size-4" />
),
error: (
<OctagonXIcon className="size-4" />
),
loading: (
<Loader2Icon className="size-4 animate-spin" />
),
}}
style={
{
+1 -6
View File
@@ -3,12 +3,7 @@ import { Loader2Icon } from "lucide-react"
function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
return (
<Loader2Icon
role="status"
aria-label="Loading"
className={cn("size-4 animate-spin", className)}
{...props}
/>
<Loader2Icon 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,
{ artistId: artistId as Id<"artists"> }
)
void runQueueAction(action, songIds.flat())
void runQueueAction(action, songIds)
break
}
}
},
[
convex,
cacheScope,
toggleArtistFavorite,
openAddArtistToPlaylist,
runQueueAction,
]
[convex, cacheScope, toggleArtistFavorite, openAddArtistToPlaylist, runQueueAction]
)
return { runSongsAction, runArtistAction }
@@ -99,8 +93,7 @@ export function useTrackListMediaAction({
return React.useCallback(
(action: MediaContextAction, songId: string) => {
const targetIds =
selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const targetIds = selectedIds.size > 0 ? Array.from(selectedIds) : [songId]
const stationArtist =
artistId ??
(songs ? stationArtistId(songs, new Set(targetIds)) : undefined)
+14 -4
View File
@@ -3,7 +3,10 @@
import * as React from "react"
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 = [
"play",
@@ -14,7 +17,12 @@ const MEDIA_SESSION_ACTIONS = [
] as const
const MEDIA_SESSION_ARTWORK_SIZES = [
64, 128, 192, 256, 384, 512,
64,
128,
192,
256,
384,
512,
] as const satisfies readonly CoverImageSize[]
function mediaSessionSupported() {
@@ -34,8 +42,10 @@ function setActionHandler(
function artworkForSong(song: BrowseSong): MediaImage[] {
return MEDIA_SESSION_ARTWORK_SIZES.map((size) => ({
src: new URL(albumCoverUrl(song.album.id, size), window.location.origin)
.href,
src: new URL(
albumCoverUrl(song.album.id, size),
window.location.origin
).href,
sizes: `${size}x${size}`,
}))
}
-11
View File
@@ -24,14 +24,3 @@ export function getConvexClient() {
}
return client
}
/**
* Downloads a Convex storage file. The backend builds storage URLs from its
* public origin, which may not be reachable from here, so the same path is
* fetched from the internal URL. `null` when it is missing.
*/
export async function fetchConvexStorageFile(storageUrl: string) {
const { pathname, search } = new URL(storageUrl)
const response = await fetch(new URL(pathname + search, getConvexServerUrl()))
return response.ok ? Buffer.from(await response.arrayBuffer()) : null
}
+2 -11
View File
@@ -12,15 +12,6 @@ export function albumCoverUrl(albumId: string, size?: CoverImageSize) {
return withCoverImageSize(`/api/album/${albumId}/cover`, size)
}
/** `version` is the summary's `cover`; it changes with the artwork. */
export function playlistCoverUrl(
playlistId: string,
version: string | null,
size?: CoverImageSize
) {
const params = new URLSearchParams()
if (version) params.set("v", version)
if (size) params.set("size", String(size))
const query = params.toString()
return `/api/playlist/${playlistId}/cover${query ? `?${query}` : ""}`
export function playlistCoverUrl(playlistId: string, size?: CoverImageSize) {
return withCoverImageSize(`/api/playlist/${playlistId}/cover`, size)
}
+5 -5
View File
@@ -7,7 +7,10 @@ export function getContiguousSelectedIndices(
.map((item, index) => (selectedIds.has(item.selectionId) ? index : -1))
.filter((index) => index >= 0)
if (selectedIndices.length > 1 && selectedIndices.includes(dragIndex)) {
if (
selectedIndices.length > 1 &&
selectedIndices.includes(dragIndex)
) {
return selectedIndices
}
@@ -34,10 +37,7 @@ export function moveQueueBlock<T>(
}
const removedBefore = sorted.filter((index) => index < targetIndex).length
const insertAt = Math.max(
0,
Math.min(targetIndex - removedBefore, remaining.length)
)
const insertAt = Math.max(0, Math.min(targetIndex - removedBefore, remaining.length))
const next = [...remaining]
next.splice(insertAt, 0, ...block)
-62
View File
@@ -1,62 +0,0 @@
/**
* Downscales an image to `size`×`size` (center-cropped cover) and returns a
* base64 data URL. JPEG, unless `keepLossless` and the file is PNG or WebP.
*/
export function resizeImageToDataUrl(
file: File,
size: number,
{ keepLossless = false } = {}
): Promise<string> {
return new Promise((resolve, reject) => {
const url = URL.createObjectURL(file)
const image = new Image()
image.onload = () => {
URL.revokeObjectURL(url)
const canvas = document.createElement("canvas")
canvas.width = size
canvas.height = size
const ctx = canvas.getContext("2d")
if (!ctx) {
reject(new Error("Could not process image"))
return
}
const scale = Math.max(size / image.width, size / image.height)
const width = image.width * scale
const height = image.height * scale
ctx.drawImage(
image,
(size - width) / 2,
(size - height) / 2,
width,
height
)
const outputType =
keepLossless &&
(file.type === "image/png" || file.type === "image/webp")
? "image/png"
: "image/jpeg"
resolve(
canvas.toDataURL(
outputType,
outputType === "image/jpeg" ? 0.9 : undefined
)
)
}
image.onerror = () => {
URL.revokeObjectURL(url)
reject(new Error("Could not load image"))
}
image.src = url
})
}
export function resizeProfileImageToDataUrl(file: File) {
return resizeImageToDataUrl(file, 256, { keepLossless: true })
}
+49
View File
@@ -0,0 +1,49 @@
const PROFILE_IMAGE_SIZE = 256
/**
* Downscales an image to 256×256 (center-cropped cover) and returns a base64 data URL.
*/
export function resizeProfileImageToDataUrl(file: File): Promise<string> {
return new Promise((resolve, reject) => {
const url = URL.createObjectURL(file)
const image = new Image()
image.onload = () => {
URL.revokeObjectURL(url)
const canvas = document.createElement("canvas")
canvas.width = PROFILE_IMAGE_SIZE
canvas.height = PROFILE_IMAGE_SIZE
const ctx = canvas.getContext("2d")
if (!ctx) {
reject(new Error("Could not process image"))
return
}
const scale = Math.max(
PROFILE_IMAGE_SIZE / image.width,
PROFILE_IMAGE_SIZE / image.height
)
const width = image.width * scale
const height = image.height * scale
const x = (PROFILE_IMAGE_SIZE - width) / 2
const y = (PROFILE_IMAGE_SIZE - height) / 2
ctx.drawImage(image, x, y, width, height)
const outputType =
file.type === "image/png" || file.type === "image/webp"
? "image/png"
: "image/jpeg"
resolve(canvas.toDataURL(outputType, outputType === "image/jpeg" ? 0.9 : undefined))
}
image.onerror = () => {
URL.revokeObjectURL(url)
reject(new Error("Could not load image"))
}
image.src = url
})
}
+8 -12
View File
@@ -1,7 +1,11 @@
import { cn } from "@/lib/utils"
export type SelectionRangePosition =
"none" | "only" | "start" | "middle" | "end"
| "none"
| "only"
| "start"
| "middle"
| "end"
export function getSelectionRangePositions(
itemIds: string[],
@@ -96,28 +100,20 @@ export function TrackRowHoverHighlight({ flush = false }: { flush?: boolean }) {
aria-hidden
className={cn(
"pointer-events-none bg-muted/60 opacity-0 transition-opacity group-hover:opacity-100",
flush
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)}
/>
)
}
/** Background for the active (focused or now playing) row. */
export function TrackRowActiveHighlight({
flush = false,
}: {
flush?: boolean
}) {
export function TrackRowActiveHighlight({ flush = false }: { flush?: boolean }) {
return (
<div
aria-hidden
className={cn(
"pointer-events-none bg-muted/60",
flush
? FLUSH_ROW_HIGHLIGHT_INSET
: [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
flush ? FLUSH_ROW_HIGHLIGHT_INSET : [TRACK_ROW_HIGHLIGHT_INSET, "rounded-lg"]
)}
/>
)
+2 -24
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_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> = {
".jpg": "image/jpeg",
@@ -34,29 +35,6 @@ function requestedCoverSize(request: Request): number | undefined {
return COVER_IMAGE_SIZES.has(size) ? size : undefined
}
/**
* Serves stored playlist artwork as a square WebP, `?size=` pixels a side
* (1024 by default). URLs
* carry the artwork's version (`?v=`), so new artwork gets a new URL and
* versioned responses can be cached for good.
*/
export async function serveStoredCover(image: Buffer, request: Request) {
const size = requestedCoverSize(request) ?? 1024
const data = await sharp(image)
.rotate()
.resize(size, size, { fit: "cover", withoutEnlargement: true })
.webp({ quality: 80 })
.toBuffer()
return new Response(new Uint8Array(data), {
headers: {
"Content-Type": "image/webp",
"Cache-Control": new URL(request.url).searchParams.has("v")
? "public, max-age=31536000, immutable"
: COVER_CACHE_CONTROL,
},
})
}
export async function serveCoverFile(
coverPath: string | null | undefined,
request: Request
+4 -1
View File
@@ -16,7 +16,10 @@ export type ByteRange = {
*/
function toWebStream(
source: Readable,
{ cancel, finish }: { cancel: () => void; finish?: () => Promise<void> }
{
cancel,
finish,
}: { cancel: () => void; finish?: () => Promise<void> }
): ReadableStream<Uint8Array> {
let done = false
+1 -2
View File
@@ -34,8 +34,7 @@ export function cacheDir(kind: "hls" | "lossless") {
function maxCacheBytes() {
const configured = Number(process.env.OTUNES_CACHE_MAX_MB)
const mb =
Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
const mb = Number.isFinite(configured) && configured > 0 ? configured : DEFAULT_MAX_MB
return mb * 1024 * 1024
}
+8 -12
View File
@@ -63,7 +63,11 @@ function hlsLookupKey(
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)
return crypto
.createHash("sha256")
@@ -80,10 +84,7 @@ async function hlsJobKey(song: SongSource, sourcePath: string, kbps: number) {
}
export function hlsSegmentPath(job: HlsJob, segmentIndex: number) {
return path.join(
job.dir,
`segment_${segmentIndex.toString().padStart(5, "0")}.ts`
)
return path.join(job.dir, `segment_${segmentIndex.toString().padStart(5, "0")}.ts`)
}
async function touchHlsJob(job: HlsJob) {
@@ -131,9 +132,7 @@ export function getExistingHlsJob(
quality: string | null,
preferAtmos: boolean
) {
return (
state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
)
return state.jobsByLookup.get(hlsLookupKey(songId, quality, preferAtmos)) ?? null
}
export async function waitForHlsSegment(
@@ -221,10 +220,7 @@ function startTranscode(job: HlsJob, sourcePath: string, kbps: number) {
if (code === 0) {
void pruneCache()
} else {
console.error(
`ffmpeg HLS exited with code ${code}`,
ffmpeg.stderrTail()
)
console.error(`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
if (code !== 0) {
throw new Error(
`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`
)
throw new Error(`Lossless conversion failed: ${code}: ${ffmpeg.stderrTail()}`)
}
await fs.rename(temporary, output)
} finally {
-1
View File
@@ -99,7 +99,6 @@ convex_cli deploy --typecheck disable --codegen disable
log "Running data migrations"
convex_cli run migrations:migrateUsers
convex_cli run migrations:migratePlaylists
# `env get` exits 0 with no output when the variable is unset. Any other failure
# must not be read as "no keys": regenerating them signs every user out.
+1 -1
View File
@@ -18,7 +18,7 @@
"prettier": "^3.8.3",
"prettier-plugin-tailwindcss": "^0.8.0"
},
"packageManager": "pnpm@12.21.0",
"packageManager": "pnpm@10.1.0",
"pnpm": {
"patchedDependencies": {
"expo-audio@58.0.10": "patches/expo-audio@58.0.10.patch",
+40 -31
View File
@@ -1,54 +1,63 @@
import type { OptimisticLocalStore, OptimisticUpdate } from "convex/browser"
import type {
FunctionArgs,
FunctionReference,
FunctionReturnType,
} from "convex/server"
import type { FunctionArgs, FunctionReference } from "convex/server"
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 FavoriteList = keyof UserFavorites
type FavoriteIds = {
favoriteSongs: Id<"songs">[]
favoriteAlbums: Id<"albums">[]
favoriteArtists: Id<"artists">[]
}
/** Rewrites one list of the cached `getUserFavorites` result, if loaded. */
function patchFavorites(
type FavoriteList = keyof FavoriteIds
function patchFavorites<List extends FavoriteList>(
store: OptimisticLocalStore,
list: FavoriteList,
update: (ids: string[]) => string[]
list: List,
update: (ids: FavoriteIds[List]) => FavoriteIds[List]
) {
const current = store.getQuery(api.favorites.getUserFavorites, {})
if (!current) return
const ids: string[] = current[list].flat()
const next = update(ids)
if (next !== ids) {
// `next` only holds ids of this list's kind, which TS cannot follow here.
store.setQuery(api.favorites.getUserFavorites, {}, {
...current,
[list]: chunk(next),
} as UserFavorites)
const next = update(current[list])
if (next !== current[list]) {
store.setQuery(
api.favorites.getUserFavorites,
{},
{
...current,
[list]: next,
}
)
}
}
function addFavorites(
function addFavorites<List extends FavoriteList>(
store: OptimisticLocalStore,
list: FavoriteList,
ids: string[]
list: List,
ids: FavoriteIds[List]
) {
patchFavorites(store, list, (current) => {
const added = ids.filter((id) => !current.includes(id))
return added.length === 0 ? current : [...new Set([...current, ...added])]
const added = ids.filter((id) => !(current as string[]).includes(id))
return added.length === 0
? current
: ([...new Set([...current, ...added])] as FavoriteIds[List])
})
}
function removeFavorites(
function removeFavorites<List extends FavoriteList>(
store: OptimisticLocalStore,
list: FavoriteList,
ids: string[]
list: List,
ids: FavoriteIds[List]
) {
const removed = new Set(ids)
patchFavorites(store, list, (current) =>
current.filter((id) => !removed.has(id))
const removed = new Set<string>(ids)
patchFavorites(
store,
list,
(current) =>
(current as string[]).filter(
(id) => !removed.has(id)
) as FavoriteIds[List]
)
}
-52
View File
@@ -1,52 +0,0 @@
import type { Id } from "../convex/_generated/dataModel"
import { COVER_GRID_ALBUMS } from "../convex/limits"
import type { BrowseSong } from "../convex/types"
export { COVER_GRID_ALBUMS }
export type CoverAlbum = BrowseSong["album"]
/** Distinct albums that have artwork, in playlist order. */
export function playlistCoverAlbums(songs: readonly BrowseSong[]) {
const albums = new Map<string, CoverAlbum>()
for (const song of songs) {
if (song.album.cover !== null && !albums.has(song.album.id)) {
albums.set(song.album.id, song.album)
}
}
return [...albums.values()]
}
/** `count` distinct items in random order (Fisher-Yates prefix). */
function sample<T>(items: readonly T[], count: number) {
const pool = [...items]
for (let index = 0; index < count; index++) {
const swap = index + Math.floor(Math.random() * (pool.length - index))
;[pool[index], pool[swap]] = [pool[swap], pool[index]]
}
return pool.slice(0, count)
}
/**
* Cover options to pick from, as album ids for `setPlaylistCoverAlbums`.
* With four or more albums: `count` random 2x2 grids, avoiding repeats.
* With fewer: each album's cover alone.
*/
export function randomPlaylistCovers(
albums: readonly CoverAlbum[],
count = 4
): Id<"albums">[][] {
const ids = albums.map((album) => album.id)
if (ids.length < COVER_GRID_ALBUMS) return ids.map((id) => [id])
const options = new Map<string, Id<"albums">[]>()
for (
let attempt = 0;
options.size < count && attempt < count * 10;
attempt++
) {
const option = sample(ids, COVER_GRID_ALBUMS)
options.set(option.join(","), option)
}
return [...options.values()]
}
-8
View File
@@ -11,10 +11,8 @@
import type * as actions from "../actions.js";
import type * as auth from "../auth.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 http from "../http.js";
import type * as images from "../images.js";
import type * as intentCatalog from "../intentCatalog.js";
import type * as intentCatalogChanges from "../intentCatalogChanges.js";
import type * as library from "../library.js";
@@ -22,8 +20,6 @@ import type * as limits from "../limits.js";
import type * as migrations from "../migrations.js";
import type * as playback from "../playback.js";
import type * as playbackState from "../playbackState.js";
import type * as playlistCover from "../playlistCover.js";
import type * as playlistCoverImages from "../playlistCoverImages.js";
import type * as playlists from "../playlists.js";
import type * as types from "../types.js";
import type * as users from "../users.js";
@@ -38,10 +34,8 @@ declare const fullApi: ApiFromModules<{
actions: typeof actions;
auth: typeof auth;
crons: typeof crons;
favoriteStore: typeof favoriteStore;
favorites: typeof favorites;
http: typeof http;
images: typeof images;
intentCatalog: typeof intentCatalog;
intentCatalogChanges: typeof intentCatalogChanges;
library: typeof library;
@@ -49,8 +43,6 @@ declare const fullApi: ApiFromModules<{
migrations: typeof migrations;
playback: typeof playback;
playbackState: typeof playbackState;
playlistCover: typeof playlistCover;
playlistCoverImages: typeof playlistCoverImages;
playlists: typeof playlists;
types: typeof types;
users: typeof users;
@@ -29,7 +29,7 @@ function playlistMutation() {
mutation: (definition) => definition,
query: (definition) => definition,
}
if (name === "./library" || name === "./limits") return {}
if (name === "./library") return {}
throw new Error(`Unexpected import ${name}`)
},
})
+1 -1
View File
@@ -5,4 +5,4 @@ export default {
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 { MutationCtx, QueryCtx } from "./_generated/server"
import { mutation, query } from "./_generated/server"
import {
addFavorites,
allFavorited,
readFavorites,
removeFavorites,
requireMigratedFavorites,
type FavoriteIdChunks,
} from "./favoriteStore"
import type { BrowsePlaylistSummary } from "./library"
import type { BrowsePlaylistDetail, BrowsePlaylistSummary } 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. */
async function requireFavoritesUser(ctx: MutationCtx) {
function uniqueIds<T extends string>(ids: T[]): T[] {
return [...new Set(ids)]
}
async function requireAuth(ctx: MutationCtx) {
const userId = await getAuthUserId(ctx)
if (userId === null) {
throw new ConvexError("Not authenticated")
}
await requireMigratedFavorites(ctx, userId)
return userId
}
@@ -50,46 +42,112 @@ async function getSongIdsForArtist(ctx: QueryCtx, artistId: Id<"artists">) {
return songs.map((song) => song._id)
}
async function promoteArtistIfAllAlbumsFavorited(
ctx: MutationCtx,
userId: Id<"users">,
artistId: Id<"artists">
function allAlbumSongsFavorited(
albumSongIds: Id<"songs">[],
favoriteSongs: Id<"songs">[]
) {
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
if (await allFavorited(ctx, userId, "album", albumIds)) {
await addFavorites(ctx, userId, "artist", [artistId])
if (albumSongIds.length === 0) {
return false
}
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(
ctx: MutationCtx,
userId: Id<"users">,
favoriteSongs: Id<"songs">[],
favoriteAlbums: Id<"albums">[],
favoriteArtists: Id<"artists">[],
songs: Doc<"songs">[]
) {
for (const albumId of new Set(songs.map((song) => song.album))) {
const songIds = await getSongIdsForAlbum(ctx, albumId)
if (await allFavorited(ctx, userId, "song", songIds)) {
await addFavorites(ctx, userId, "album", [albumId])
}
let albums = favoriteAlbums
let artists = favoriteArtists
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({
args: {},
handler: async (ctx): Promise<FavoriteIdChunks> => {
handler: async (ctx) => {
const userId = await getAuthUserId(ctx)
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 {
favoriteSongs: chunk(favorites.favoriteSongs),
favoriteAlbums: chunk(favorites.favoriteAlbums),
favoriteArtists: chunk(favorites.favoriteArtists),
favoriteSongs: user.favoriteSongs ?? [],
favoriteAlbums: user.favoriteAlbums ?? [],
favoriteArtists: user.favoriteArtists ?? [],
}
},
})
@@ -107,7 +165,6 @@ async function browseFavoritesSummaryHandler(
return null
}
const { favoriteSongs } = await readFavorites(ctx, userId)
return {
id: null,
isFavorites: true,
@@ -119,13 +176,13 @@ async function browseFavoritesSummaryHandler(
cover: null,
isOwner: true,
isSubscribed: false,
songIds: favoriteSongs,
songIds: user.favoriteSongs ?? [],
}
}
export const browseFavoritesPlaylistDetail = query({
args: {},
handler: async (ctx): Promise<BrowseFavoritesDetail | null> => {
handler: async (ctx): Promise<BrowsePlaylistDetail | null> => {
const summary = await browseFavoritesSummaryHandler(ctx)
if (!summary) {
return null
@@ -139,7 +196,7 @@ export const browseFavoritesPlaylistDetail = query({
title: summary.title,
owner: summary.owner,
cover: summary.cover,
songs: chunk(songs),
songs,
isOwner: summary.isOwner,
isSubscribed: summary.isSubscribed,
}
@@ -149,35 +206,69 @@ export const browseFavoritesPlaylistDetail = query({
export const favoriteSong = mutation({
args: { songId: v.id("songs") },
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)
if (!song) {
throw new ConvexError("Song not found")
}
await addFavorites(ctx, userId, "song", [songId])
await cascadeUpFromSongs(ctx, userId, [song])
const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), songId])
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({
args: { songIds: v.array(v.id("songs")) },
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(
[...new Set(songIds)].map((id) => ctx.db.get("songs", id))
uniqueRequestedIds.map((id) => ctx.db.get("songs", id))
)
const songs = loadedSongs.filter(
(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,
userId,
"song",
songs.map((song) => song._id)
favoriteSongs,
user.favoriteAlbums ?? [],
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(
ctx: MutationCtx,
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(
[...new Set(songIds)].map((songId) => ctx.db.get("songs", songId))
[...removeSongs].map((songId) => ctx.db.get("songs", songId))
)
const songs = loadedSongs.filter(
(song): song is Doc<"songs"> => song !== null
const removeAlbums = new Set(
loadedSongs.flatMap((song) => (song ? [song.album] : []))
)
const removeArtists = new Set(
loadedSongs.flatMap((song) => (song ? [song.albumArtist] : []))
)
await removeFavorites(ctx, userId, "song", songIds)
await removeFavorites(
ctx,
userId,
"album",
songs.map((song) => song.album)
)
await removeFavorites(
ctx,
userId,
"artist",
songs.map((song) => song.albumArtist)
)
await ctx.db.patch(userId, {
favoriteSongs: (user.favoriteSongs ?? []).filter(
(id) => !removeSongs.has(id)
),
favoriteAlbums: (user.favoriteAlbums ?? []).filter(
(id) => !removeAlbums.has(id)
),
favoriteArtists: (user.favoriteArtists ?? []).filter(
(id) => !removeArtists.has(id)
),
})
}
export const favoriteAlbum = mutation({
args: { albumId: v.id("albums") },
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)
if (!album) {
throw new ConvexError("Album not found")
}
await addFavorites(ctx, userId, "album", [albumId])
await addFavorites(
const songIds = await getSongIdsForAlbum(ctx, albumId)
const favoriteAlbums = uniqueIds([...(user.favoriteAlbums ?? []), albumId])
const favoriteSongs = uniqueIds([...(user.favoriteSongs ?? []), ...songIds])
const favoriteArtists = await promoteArtistIfAllAlbumsFavorited(
ctx,
userId,
"song",
await getSongIdsForAlbum(ctx, albumId)
favoriteAlbums,
user.favoriteArtists ?? [],
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({
args: { albumId: v.id("albums") },
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)
if (!album) {
return
}
await removeFavorites(ctx, userId, "album", [albumId])
await removeFavorites(ctx, userId, "artist", [album.artist])
await removeFavorites(
ctx,
userId,
"song",
await getSongIdsForAlbum(ctx, albumId)
const albumSongIds = await getSongIdsForAlbum(ctx, albumId)
const removeSongs = new Set(albumSongIds)
const favoriteAlbums = (user.favoriteAlbums ?? []).filter(
(id) => id !== 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({
args: { artistId: v.id("artists") },
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)
if (!artist) {
throw new ConvexError("Artist not found")
}
await addFavorites(ctx, userId, "artist", [artistId])
await addFavorites(
ctx,
userId,
"album",
await getAlbumIdsForArtist(ctx, artistId)
)
await addFavorites(
ctx,
userId,
"song",
await getSongIdsForArtist(ctx, artistId)
)
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
const songIds = await getSongIdsForArtist(ctx, artistId)
await ctx.db.patch(userId, {
favoriteArtists: uniqueIds([...(user.favoriteArtists ?? []), artistId]),
favoriteAlbums: uniqueIds([...(user.favoriteAlbums ?? []), ...albumIds]),
favoriteSongs: uniqueIds([...(user.favoriteSongs ?? []), ...songIds]),
})
},
})
/** Unfavorites an artist along with all of their albums and songs. */
export const unfavoriteArtist = mutation({
args: { artistId: v.id("artists") },
handler: async (ctx, { artistId }) => {
const userId = await requireFavoritesUser(ctx)
await removeFavorites(ctx, userId, "artist", [artistId])
await removeFavorites(
ctx,
userId,
"album",
await getAlbumIdsForArtist(ctx, artistId)
)
await removeFavorites(
ctx,
userId,
"song",
await getSongIdsForArtist(ctx, artistId)
)
const userId = await requireAuth(ctx)
const user = await ctx.db.get("users", userId)
if (!user) {
throw new ConvexError("User not found")
}
const albumIds = await getAlbumIdsForArtist(ctx, artistId)
const songIds = await getSongIdsForArtist(ctx, artistId)
const removeAlbums = new Set(albumIds)
const removeSongs = new Set(songIds)
await ctx.db.patch(userId, {
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 { auth } from "./auth"
import { httpRouter } from "convex/server";
import { auth } from "./auth";
const http = httpRouter()
const http = httpRouter();
auth.addHttpRoutes(http)
auth.addHttpRoutes(http);
export default http
export default http;
-29
View File
@@ -1,29 +0,0 @@
import { ConvexError } from "convex/values"
import { MAX_IMAGE_UPLOAD_BYTES } from "./limits"
const DATA_URL_PATTERN = /^data:(image\/[\w.+-]+);base64,([A-Za-z0-9+/=]+)$/
/**
* Splits an image data URL, rejecting anything over the size cap. `label`
* names the image in error messages ("Profile photo").
*/
export function parseImageDataUrl(image: string, label: string) {
const match = DATA_URL_PATTERN.exec(image)
if (!match) {
throw new ConvexError(`${label} must be an image`)
}
const [, contentType, base64] = match
if (Math.floor((base64.length * 3) / 4) > MAX_IMAGE_UPLOAD_BYTES) {
throw new ConvexError(
`${label} must be ${MAX_IMAGE_UPLOAD_BYTES / 1024 / 1024} MB or smaller`
)
}
return { contentType, base64 }
}
/** Decodes an image data URL for `ctx.storage.store`. */
export function imageDataUrlToBlob(image: string, label: string) {
const { contentType, base64 } = parseImageDataUrl(image, label)
const bytes = Uint8Array.from(atob(base64), (char) => char.charCodeAt(0))
return new Blob([bytes], { type: contentType })
}
+25 -88
View File
@@ -21,10 +21,7 @@ import type {
SearchTopResultItem,
SidebarPlaylists,
} from "./types"
import { purgeFavoriteEntities } from "./favoriteStore"
import { chunk, type Chunked } from "./limits"
import { recordIntentCatalogChanges } from "./intentCatalogChanges"
import { playlistCoverVersion } from "./playlistCover"
export type {
BrowseAlbum,
@@ -157,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(
ctx: QueryCtx,
songIds: Id<"songs">[]
): Promise<BrowseSong[]> {
if (songIds.length > MAX_SONG_GETS) {
return browseSongsByScan(ctx, songIds)
}
const songs = await Promise.all(
songIds.map((songId) => ctx.db.get("songs", songId))
)
@@ -179,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(
ctx: QueryCtx,
songs: Doc<"songs">[]
@@ -247,34 +214,32 @@ function toBrowseSong(
export const browseAlbums = query({
args: {},
handler: async (ctx): Promise<Chunked<BrowseAlbum>> => {
handler: async (ctx) => {
if (!(await isSignedIn(ctx))) {
return []
}
const artistMap = await loadArtistMap(ctx)
const albums = await ctx.db.query("albums").collect()
return chunk(
albums
.flatMap((album) => {
const artist = artistMap.get(album.artist)
return artist ? [toBrowseAlbum(album, artist)] : []
})
.sort((a, b) => a.title.localeCompare(b.title))
)
return albums
.flatMap((album) => {
const artist = artistMap.get(album.artist)
return artist ? [toBrowseAlbum(album, artist)] : []
})
.sort((a, b) => a.title.localeCompare(b.title))
},
})
export const browseArtists = query({
args: {},
handler: async (ctx): Promise<Chunked<BrowseArtist>> => {
handler: async (ctx) => {
if (!(await isSignedIn(ctx))) {
return []
}
const artists = await ctx.db.query("artists").collect()
return chunk(
artists.map(toBrowseArtist).sort((a, b) => a.name.localeCompare(b.name))
)
return artists
.map(toBrowseArtist)
.sort((a, b) => a.name.localeCompare(b.name))
},
})
@@ -543,9 +508,7 @@ export const browseSortedSongIds = query({
},
handler: async (ctx, args) => {
await requireSignedIn(ctx)
return chunk(
await getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection)
)
return getSortedLibrarySongIds(ctx, args.sortKey, args.sortDirection)
},
})
@@ -642,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({
args: { query: v.string() },
handler: async (ctx, args) => {
@@ -743,15 +700,9 @@ export const searchLibrary = query({
const result: LibrarySearchResults = {
topResults,
artists: artistResults
.slice(0, MAX_SEARCH_RESULTS)
.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),
artists: artistResults.map((result) => result.item),
albums: albumResults.map((result) => result.item),
songs: songResults.map((result) => result.item),
}
return result
},
@@ -759,7 +710,7 @@ export const searchLibrary = query({
export const browseRecentlyAdded = query({
args: { limit: v.optional(v.number()) },
handler: async (ctx, args): Promise<Chunked<BrowseAlbum>> => {
handler: async (ctx, args) => {
if (!(await isSignedIn(ctx))) {
return []
}
@@ -772,12 +723,10 @@ export const browseRecentlyAdded = query({
albums.map((album) => album.artist)
)
return chunk(
albums.flatMap((album) => {
const artist = artistMap.get(album.artist)
return artist ? [toBrowseAlbum(album, artist)] : []
})
)
return albums.flatMap((album) => {
const artist = artistMap.get(album.artist)
return artist ? [toBrowseAlbum(album, artist)] : []
})
},
})
@@ -876,7 +825,7 @@ async function browseRecentlyPlayedItems(ctx: QueryCtx, limit?: number) {
id: entry.playlist._id,
title: entry.playlist.name,
owner: ownerMap.get(entry.playlist.owner)?.name ?? "Unknown",
cover: playlistCoverVersion(entry.playlist),
cover: entry.playlist.cover,
})
}
@@ -944,6 +893,7 @@ export const scanSongsPage = internalQuery({
},
})
/** Public: share-link previews load covers without a session. */
export const getArtistCover = query({
args: { id: v.id("artists") },
@@ -960,15 +910,11 @@ export const getAlbumCover = query({
},
})
/**
* Public: share-link previews load covers without a session. A storage URL
* the web server proxies, or `null` when the playlist has no artwork.
*/
/** Public: share-link previews load covers without a session. */
export const getPlaylistCover = query({
args: { id: v.id("playlists") },
handler: async (ctx, args) => {
const storageId = (await ctx.db.get("playlists", args.id))?.coverStorageId
return storageId ? await ctx.storage.getUrl(storageId) : null
return (await ctx.db.get("playlists", args.id))?.cover ?? null
},
})
@@ -1216,10 +1162,7 @@ async function purgeSongsFromUsersAndPlaylists(
}
}
await purgeFavoriteEntities(ctx, remove)
// Legacy favorite and queue fields stay until `migrations.migrateUsers`
// clears them.
// Legacy queue fields stay until `migrations.migrateUsers` clears them.
for (const user of await ctx.db.query("users").collect()) {
const favoriteSongs = user.favoriteSongs
const songQueue = user.songQueue
@@ -1260,9 +1203,6 @@ async function purgeAlbumsFromUsers(
return
}
await purgeFavoriteEntities(ctx, remove)
// Legacy `favoriteAlbums` stays until `migrations.migrateUsers` clears it.
for (const user of await ctx.db.query("users").collect()) {
const favoriteAlbums = user.favoriteAlbums
const recentlyPlayed = user.recentlyPlayed
@@ -1293,9 +1233,6 @@ async function purgeArtistsFromUsers(
return
}
await purgeFavoriteEntities(ctx, remove)
// Legacy `favoriteArtists` stays until `migrations.migrateUsers` clears it.
for (const user of await ctx.db.query("users").collect()) {
const favoriteArtists = user.favoriteArtists
if (favoriteArtists?.some((artistId) => remove.has(artistId))) {
+2 -22
View File
@@ -6,25 +6,5 @@
/** Songs kept in the playback queue, including the current song. */
export const MAX_QUEUE_LENGTH = 5_000
/** Largest uploaded image (profile photo, playlist cover), in bytes after base64 decoding. */
export const MAX_IMAGE_UPLOAD_BYTES = 2 * 1024 * 1024
/** Album covers a generated playlist cover tiles 2x2. */
export const COVER_GRID_ALBUMS = 4
/** 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
}
/** Largest profile photo accepted, in bytes after base64 decoding. */
export const MAX_PROFILE_IMAGE_BYTES = 2 * 1024 * 1024
+2 -50
View File
@@ -1,15 +1,13 @@
import { v } from "convex/values"
import { internal } from "./_generated/api"
import { internalMutation } from "./_generated/server"
import { hasLegacyFavorites, migrateUserFavorites } from "./favoriteStore"
import { hasLegacyPlayback, migrateUserPlayback } from "./playbackState"
const BATCH_SIZE = 25
/**
* Moves playback state off `users` into `playbackStates`/`playbackProgress`,
* favorite arrays into `favorites` rows, and legacy data URL avatars into
* file storage. Idempotent; the Docker
* Moves playback state off `users` into `playbackStates`/`playbackProgress`
* and legacy data URL avatars into file storage. Idempotent; the Docker
* entrypoint runs it on every boot. Run manually with
* `npx convex run migrations:migrateUsers`.
*/
@@ -24,12 +22,6 @@ export const migrateUsers = internalMutation({
if (hasLegacyPlayback(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:")) {
await ctx.scheduler.runAfter(0, internal.users.storeProfileImage, {
userId: user._id,
@@ -45,43 +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)
}
},
})
/**
* Draws automatic artwork for playlists that have none yet. Idempotent; the
* Docker entrypoint runs it on every boot.
*/
export const migratePlaylists = internalMutation({
args: { cursor: v.optional(v.union(v.string(), v.null())) },
handler: async (ctx, { cursor }) => {
const page = await ctx.db
.query("playlists")
.paginate({ cursor: cursor ?? null, numItems: BATCH_SIZE })
for (const playlist of page.page) {
if (!playlist.coverSource && !playlist.coverAlbums) {
await ctx.scheduler.runAfter(
0,
internal.playlistCover.refreshPlaylistCover,
{ playlistId: playlist._id }
)
}
}
if (!page.isDone) {
await ctx.scheduler.runAfter(0, internal.migrations.migratePlaylists, {
cursor: page.continueCursor,
})
}
},
})
-161
View File
@@ -1,161 +0,0 @@
import { v } from "convex/values"
import { internal } from "./_generated/api"
import type { Doc, Id } from "./_generated/dataModel"
import type { MutationCtx } from "./_generated/server"
import { internalMutation, internalQuery } from "./_generated/server"
import { COVER_GRID_ALBUMS } from "./limits"
/*
* Playlist artwork is a stored image (`coverStorageId`), drawn once and
* redrawn only when its inputs change:
* - automatic (no `coverSource`): the first albums in the playlist, kept in
* sync by `refreshAutomaticCover` whenever the songs change
* - "albums": albums the owner picked
* - "upload": an image the owner uploaded
* `coverAlbums` holds the albums behind the current or pending drawing: four
* tile 2x2, one shows alone. Drawing happens in `playlistCoverImages`.
*/
/**
* What clients put in the cover URL (`?v=`) so new artwork gets a new URL.
* `null` when the playlist has no artwork.
*/
export function playlistCoverVersion(playlist: Doc<"playlists">) {
return playlist.coverStorageId ?? null
}
/** Songs read when picking automatic artwork, so long single-album runs stay cheap. */
const AUTO_COVER_SONG_SCAN = 50
/** First distinct album covers in playlist order: four for a grid, else one. */
async function automaticCoverAlbums(ctx: MutationCtx, songIds: Id<"songs">[]) {
const seen = new Set<Id<"albums">>()
const albums: Id<"albums">[] = []
for (const songId of songIds.slice(0, AUTO_COVER_SONG_SCAN)) {
const song = await ctx.db.get("songs", songId)
if (!song || seen.has(song.album)) continue
seen.add(song.album)
const album = await ctx.db.get("albums", song.album)
if (album?.cover) albums.push(album._id)
if (albums.length === COVER_GRID_ALBUMS) break
}
return albums.length === COVER_GRID_ALBUMS ? albums : albums.slice(0, 1)
}
function sameAlbums(a: Id<"albums">[] | undefined, b: Id<"albums">[]) {
return a?.length === b.length && a.every((id, index) => id === b[index])
}
/**
* Points `coverAlbums` at new albums and queues a drawing of them. The old
* image stays up until the new one lands.
*/
export async function drawCoverAlbums(
ctx: MutationCtx,
playlist: Doc<"playlists">,
albumIds: Id<"albums">[],
coverSource: "albums" | undefined
) {
await ctx.db.patch(playlist._id, { coverAlbums: albumIds, coverSource })
await ctx.scheduler.runAfter(
0,
internal.playlistCoverImages.renderPlaylistCover,
{ playlistId: playlist._id, albumIds }
)
}
/**
* Keeps automatic artwork in step with the playlist's first albums. Call
* after the songs change, with the new order. Draws only when the albums
* differ from the last drawing.
*/
export async function refreshAutomaticCover(
ctx: MutationCtx,
playlist: Doc<"playlists">,
songIds: Id<"songs">[]
) {
if (playlist.coverSource) return
const albums = await automaticCoverAlbums(ctx, songIds)
if (sameAlbums(playlist.coverAlbums, albums)) return
if (albums.length > 0) {
await drawCoverAlbums(ctx, playlist, albums, undefined)
return
}
if (playlist.coverStorageId) await ctx.storage.delete(playlist.coverStorageId)
await ctx.db.patch(playlist._id, {
coverAlbums: undefined,
coverStorageId: undefined,
})
}
/** Album cover file paths for a drawing, or `null` if any lost its artwork. */
export const coverFilePaths = internalQuery({
args: { albumIds: v.array(v.id("albums")) },
handler: async (ctx, { albumIds }) => {
const albums = await Promise.all(
albumIds.map((id) => ctx.db.get("albums", id))
)
const paths = albums.flatMap((album) => (album?.cover ? [album.cover] : []))
return paths.length === albumIds.length ? paths : null
},
})
/** Deletes the image `storageId` replaces. */
async function deleteReplacedImage(
ctx: MutationCtx,
playlist: Doc<"playlists">,
storageId: Id<"_storage">
) {
if (playlist.coverStorageId && playlist.coverStorageId !== storageId) {
await ctx.storage.delete(playlist.coverStorageId)
}
}
/** Saves a finished drawing unless the playlist moved on while it rendered. */
export const attachRenderedCover = internalMutation({
args: {
playlistId: v.id("playlists"),
albumIds: v.array(v.id("albums")),
storageId: v.id("_storage"),
},
handler: async (ctx, { playlistId, albumIds, storageId }) => {
const playlist = await ctx.db.get("playlists", playlistId)
if (
!playlist ||
playlist.coverSource === "upload" ||
!sameAlbums(playlist.coverAlbums, albumIds)
) {
await ctx.storage.delete(storageId)
return
}
await deleteReplacedImage(ctx, playlist, storageId)
await ctx.db.patch(playlist._id, { coverStorageId: storageId })
},
})
/** Saves an uploaded image as the playlist's artwork. */
export const attachUploadedCover = internalMutation({
args: { playlistId: v.id("playlists"), storageId: v.id("_storage") },
handler: async (ctx, { playlistId, storageId }) => {
const playlist = await ctx.db.get("playlists", playlistId)
if (!playlist) {
await ctx.storage.delete(storageId)
return
}
await deleteReplacedImage(ctx, playlist, storageId)
await ctx.db.patch(playlist._id, {
coverSource: "upload",
coverAlbums: undefined,
coverStorageId: storageId,
})
},
})
/** Draws automatic artwork for one playlist. Scheduled by `migratePlaylists`. */
export const refreshPlaylistCover = internalMutation({
args: { playlistId: v.id("playlists") },
handler: async (ctx, { playlistId }) => {
const playlist = await ctx.db.get("playlists", playlistId)
if (playlist) await refreshAutomaticCover(ctx, playlist, playlist.songs)
},
})
@@ -1,123 +0,0 @@
"use node"
import * as fs from "node:fs/promises"
import { v } from "convex/values"
import * as jpeg from "jpeg-js"
import { internal } from "./_generated/api"
import { internalAction } from "./_generated/server"
import { imageDataUrlToBlob } from "./images"
/*
* Draws playlist artwork into storage. Pure JS on purpose: self-hosted Convex
* cannot install native packages like sharp for node actions. Album covers
* are always `cover.jpg` / `folder.jpg`, so JPEG in and out is enough.
*/
/** Stored playlist artwork is square, this many pixels a side. */
const COVER_SIZE = 1024
const JPEG_QUALITY = 88
type Rgba = { width: number; height: number; data: Uint8Array }
/**
* Center-crops `source` to a square and area-averages it into `target` at
* (`left`, `top`), `size` pixels a side. Averaging keeps downscaled covers
* smooth; tiny covers upscale blocky but intact.
*/
function drawSquare(
source: Rgba,
target: Rgba,
left: number,
top: number,
size: number
) {
const side = Math.min(source.width, source.height)
const offsetX = Math.floor((source.width - side) / 2)
const offsetY = Math.floor((source.height - side) / 2)
const scale = side / size
for (let y = 0; y < size; y++) {
const y0 = offsetY + Math.floor(y * scale)
const y1 = Math.max(y0 + 1, offsetY + Math.floor((y + 1) * scale))
for (let x = 0; x < size; x++) {
const x0 = offsetX + Math.floor(x * scale)
const x1 = Math.max(x0 + 1, offsetX + Math.floor((x + 1) * scale))
let r = 0
let g = 0
let b = 0
for (let sy = y0; sy < y1; sy++) {
let index = (sy * source.width + x0) * 4
for (let sx = x0; sx < x1; sx++, index += 4) {
r += source.data[index]
g += source.data[index + 1]
b += source.data[index + 2]
}
}
const count = (x1 - x0) * (y1 - y0)
const out = ((top + y) * target.width + left + x) * 4
target.data[out] = r / count
target.data[out + 1] = g / count
target.data[out + 2] = b / count
target.data[out + 3] = 255
}
}
}
/** One cover alone, or four tiled 2x2 left to right, top to bottom. */
async function drawCover(paths: string[]) {
const canvas: Rgba = {
width: COVER_SIZE,
height: COVER_SIZE,
data: new Uint8Array(COVER_SIZE * COVER_SIZE * 4),
}
const tile = paths.length === 1 ? COVER_SIZE : COVER_SIZE / 2
// One at a time: a decoded 3000px cover is ~36 MB.
for (const [index, path] of paths.entries()) {
const source = jpeg.decode(await fs.readFile(path), { useTArray: true })
drawSquare(
source,
canvas,
(index % 2) * tile,
Math.floor(index / 2) * tile,
tile
)
}
return jpeg.encode(canvas, JPEG_QUALITY).data
}
/** Draws album artwork into storage. Scheduled by `drawCoverAlbums`. */
export const renderPlaylistCover = internalAction({
args: { playlistId: v.id("playlists"), albumIds: v.array(v.id("albums")) },
handler: async (ctx, { playlistId, albumIds }) => {
const paths = await ctx.runQuery(internal.playlistCover.coverFilePaths, {
albumIds,
})
if (!paths) return
const image = await drawCover(paths)
const storageId = await ctx.storage.store(
new Blob([new Uint8Array(image)], { type: "image/jpeg" })
)
await ctx.runMutation(internal.playlistCover.attachRenderedCover, {
playlistId,
albumIds,
storageId,
})
},
})
/**
* Stores an uploaded data URL as is; clients send it square. Scheduled by
* `uploadPlaylistCover`.
*/
export const storeUploadedCover = internalAction({
args: { playlistId: v.id("playlists"), image: v.string() },
handler: async (ctx, { playlistId, image }) => {
const storageId = await ctx.storage.store(
imageDataUrlToBlob(image, "Cover")
)
await ctx.runMutation(internal.playlistCover.attachUploadedCover, {
playlistId,
storageId,
})
},
})
Loaded 100 of 107 files, more files were not shown because too many files have changed in this diff. Show more