feat: open shared links in the mobile app and share artwork (#67)

This commit was merged in pull request #67.
This commit is contained in:
joshuafhiggins committed 2026-11-03 21:06:33 -05:00
1 parent 8f7a9893c1
commit 3381355d8a
21 files changed
+338 -20

No files matched your search

+19
View File
@@ -23,3 +23,22 @@ APP_VARIANT=development pnpm start
An unset `APP_VARIANT` keeps the production identity. Unknown variants fail
configuration. URL schemes are `otunes-development`, `otunes-preview`, and
`otunes` respectively, allowing the apps to be installed together.
### Shared links and artwork
Shared URLs stay as ordinary HTTPS links. The web page's "Open App" action
opens `otunes://open?url=<encoded HTTPS URL>`, including the server address and
album, artist, or playlist destination. No domain association files, signing
settings, or per-server mobile builds are needed.
The app checks the link's server against its configured server before opening
media. Links for another server do not switch the current server. On a fresh
installation, the server address is prefilled in setup. The destination is kept
in memory through setup and sign-in, and is opened after authentication.
The browser may ask before opening the app. If the app is absent, the web page
remains available. Native changes still require a new mobile build.
Native sharing supplies media titles and artwork through iOS link metadata and Android's chooser
thumbnail, while sharing the original HTTPS URL. Receiving apps control whether
they display previews. If artwork cannot load, the URL is still shared. Existing
builds without the native sharing module fall back to URL-only sharing.
@@ -186,7 +186,7 @@ export default function AlbumScreen() {
stationArtistId={album.artist.id}
selectedCount={album.tracks.length}
favorited={isAlbumFav(album.id)}
share={{ type: "album", albumId: album.id }}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) =>
void handleAlbumDetailAction(
album.id as Id<"albums">,
@@ -406,6 +406,7 @@ const AlbumTrackRow = memo(function AlbumTrackRow({
type: "song",
albumId: album.id,
songId: track.id,
title: `${track.title} - ${album.title}`,
}}
onAction={(action) => void onAction(track, album, action)}
>
@@ -75,7 +75,11 @@ export default function ArtistScreen() {
<MediaActionMenu
selectedCount={data.albums.length}
favorited={isArtistFav(data.artist.id)}
share={{ type: "artist", artistId: data.artist.id }}
share={{
type: "artist",
artistId: data.artist.id,
title: data.artist.name,
}}
onAction={(action) =>
void handleArtistAction(data.artist, action)
}
@@ -142,7 +142,7 @@ const ArtistRow = memo(function ArtistRow({
return (
<MediaContextMenu
favorited={favorited}
share={{ type: "artist", artistId: artist.id }}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void onAction(artist, action)}
>
<Pressable
@@ -254,6 +254,7 @@ function PlaylistContent({
share={{
type: "playlist",
playlistId: playlistId ?? "favorites",
title: playlist?.title ?? "oTunes",
}}
includeActions={canEdit ? OWNER_MENU_ACTIONS : undefined}
onAction={handlePlaylistMenuAction}
@@ -276,6 +277,7 @@ function PlaylistContent({
palette.background,
palette.isDark,
playlistId,
playlist?.title,
router,
songIds,
])
+20 -1
View File
@@ -1,3 +1,10 @@
import { router, type Href } from "expo-router"
import { useServerConfig } from "@/contexts/server-config"
import {
incomingMediaLink,
subscribeIncomingMediaLink,
takeIncomingMediaLink,
} from "@/lib/incoming-media-link"
import { useConvexAuth as useLocalConvexAuth } from "@convex-dev/auth/react"
import {
useConvexAuth as useServerConvexAuth,
@@ -5,7 +12,7 @@ import {
} from "convex/react"
import { Stack } from "expo-router"
import { Platform } from "react-native"
import { useEffect } from "react"
import { useEffect, useSyncExternalStore } from "react"
import { AppIntentBridge } from "@/components/app-intent-bridge"
import { ConvexAuthRecovery } from "@/components/convex-auth-recovery"
@@ -24,6 +31,18 @@ export default function AppLayout() {
const { isWebSocketConnected } = useConvexConnectionState()
const { invalidateSession } = useInvalidateAuthSession()
const stackOptions = useStackScreenOptions()
const { config } = useServerConfig()
const pendingDestination = useSyncExternalStore(
subscribeIncomingMediaLink,
() => (config ? incomingMediaLink(config.serverUrl) : null),
() => null
)
useEffect(() => {
if (!config || !pendingDestination) return
const destination = takeIncomingMediaLink(config.serverUrl)
if (destination) router.replace(destination as Href)
}, [config, pendingDestination])
useEffect(() => {
if (
+54
View File
@@ -0,0 +1,54 @@
import { loadServerConfig, parseServerHostname } from "@/lib/server-config"
import { secureGetItem } from "@/lib/auth-storage"
import { rememberIncomingMediaLink } from "@/lib/incoming-media-link"
import { showError } from "@/lib/toast"
export async function redirectSystemPath({
path,
}: {
path: string
initial: boolean
}) {
try {
const link = new URL(path, "otunes:///")
if (
!["otunes:", "otunes-development:", "otunes-preview:"].includes(
link.protocol
) ||
link.hostname !== "open"
) {
return path
}
const target = new URL(link.searchParams.get("url") ?? "")
const server = parseServerHostname(target.host)
if (
!server ||
!["https:", "http:"].includes(target.protocol) ||
target.username ||
target.password ||
new URL(server.serverUrl).origin !== target.origin ||
!/^\/(album|artist|playlist)\/[a-zA-Z0-9_-]+$/.test(target.pathname)
) {
return "/"
}
const config = await loadServerConfig(secureGetItem)
if (config && new URL(config.serverUrl).origin !== target.origin) {
showError("This link belongs to a different oTunes server")
return "/"
}
const query = new URLSearchParams()
const songId = target.searchParams.get("s")
if (target.pathname.startsWith("/album/") && songId) query.set("s", songId)
const suffix = query.size ? `?${query}` : ""
const destination = `/(app)/(tabs)/home${target.pathname}${suffix}`
rememberIncomingMediaLink(destination, target.origin)
return config
? destination
: `/server?hostname=${encodeURIComponent(server.hostname)}`
} catch {
return "/"
}
}
+10 -2
View File
@@ -1,5 +1,6 @@
import { useConvexAuth } from "@convex-dev/auth/react"
import { Redirect } from "expo-router"
import { incomingMediaLink } from "@/lib/incoming-media-link"
import { Redirect, type Href } from "expo-router"
import { useServerConfig } from "@/contexts/server-config"
@@ -11,9 +12,16 @@ export default function Index() {
return <Redirect href="/server" />
}
const destination = auth?.isAuthenticated
? incomingMediaLink(config.serverUrl)
: null
return (
<Redirect
href={auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin"}
href={
(destination as Href) ??
(auth?.isAuthenticated ? "/(app)/(tabs)/library" : "/signin")
}
/>
)
}
+10 -2
View File
@@ -1,4 +1,5 @@
import { useState } from "react"
import { useLocalSearchParams } from "expo-router"
import { useEffect, useState } from "react"
import { StyleSheet, Text, View } from "react-native"
import { SafeAreaView } from "react-native-safe-area-context"
@@ -11,7 +12,14 @@ import { spacing, useThemeColors } from "@/lib/theme"
export default function ServerScreen() {
const colors = useThemeColors()
const { setServerHostname } = useServerConfig()
const [hostname, setHostname] = useState("")
const { hostname: linkedHostname } = useLocalSearchParams<{
hostname?: string
}>()
const [hostname, setHostname] = useState(linkedHostname ?? "")
useEffect(() => {
if (linkedHostname) setHostname(linkedHostname)
}, [linkedHostname])
const [error, setError] = useState<string | null>(null)
const [submitting, setSubmitting] = useState(false)
+7 -3
View File
@@ -80,7 +80,7 @@ export const AlbumCard = memo(function AlbumCard({
favorited={isAlbumFavorite(album.id)}
stationArtistId={album.artist.id}
navigation={{ artist: { id: album.artist.id } }}
share={{ type: "album", albumId: album.id }}
share={{ type: "album", albumId: album.id, title: album.title }}
onAction={(action) => void handleAlbumAction(album, action)}
>
<MusicEntityView kind="album" id={album.id}>
@@ -125,7 +125,7 @@ export const ArtistCard = memo(function ArtistCard({
return (
<MediaContextMenu
favorited={isArtistFavorite(artist.id)}
share={{ type: "artist", artistId: artist.id }}
share={{ type: "artist", artistId: artist.id, title: artist.name }}
onAction={(action) => void handleArtistAction(artist, action)}
>
<MusicEntityView kind="artist" id={artist.id}>
@@ -176,7 +176,11 @@ export const PlaylistCard = memo(function PlaylistCard({
return (
<MediaContextMenu
showFavorite={false}
share={{ type: "playlist", playlistId: playlist.id }}
share={{
type: "playlist",
playlistId: playlist.id,
title: playlist.title,
}}
onAction={(action) => void handlePlaylistAction(playlist, action)}
>
<MusicEntityView kind="playlist" id={playlist.id}>
+1
View File
@@ -147,6 +147,7 @@ export const SongListRow = memo(function SongListRow({
type: "song",
albumId: song.album.id,
songId: song.id,
title: `${song.title} - ${song.album.title}`,
},
onAction: (action) => onAction(song, action),
}}
+30
View File
@@ -0,0 +1,30 @@
// Keep the destination while server setup or sign-in is on screen.
const listeners = new Set<() => void>()
export function subscribeIncomingMediaLink(listener: () => void) {
listeners.add(listener)
return () => {
listeners.delete(listener)
}
}
let pendingLink: { path: string; serverOrigin: string } | null = null
export function incomingMediaLink(serverUrl: string) {
if (!pendingLink) return null
return new URL(serverUrl).origin === pendingLink.serverOrigin
? pendingLink.path
: null
}
export function takeIncomingMediaLink(serverUrl: string) {
const path = incomingMediaLink(serverUrl)
pendingLink = null
for (const listener of listeners) listener()
return path
}
export function rememberIncomingMediaLink(path: string, serverOrigin: string) {
pendingLink = { path, serverOrigin }
for (const listener of listeners) listener()
}
+2 -1
View File
@@ -1,8 +1,9 @@
export type MediaShareContext =
export type MediaShareContext = (
| { type: "album"; albumId: string }
| { type: "song"; albumId: string; songId: string }
| { type: "playlist"; playlistId: string; isFavorites?: boolean }
| { type: "artist"; artistId: string }
) & { title: string }
export function shouldShowShare(
share: MediaShareContext | undefined,
+27 -2
View File
@@ -1,3 +1,4 @@
import { requireOptionalNativeModule } from "expo"
import * as Sharing from "expo-sharing"
import { Platform, Share } from "react-native"
@@ -5,6 +6,10 @@ import type { MediaShareContext } from "@/lib/media-links"
import { mediaShareUrl } from "@/lib/media-links"
import { showError } from "@/lib/toast"
const nativeShare = requireOptionalNativeModule<{
share: (url: string, artwork: string, title: string) => Promise<void>
}>("MediaLinkShare")
export async function shareMediaLink(
serverUrl: string,
share: MediaShareContext
@@ -17,12 +22,32 @@ export async function shareMediaLink(
showError("Sharing is not available on this device")
return
}
await Sharing.shareAsync(url, { dialogTitle: "Share" })
await Sharing.shareAsync(url, { dialogTitle: share.title })
return
}
if (nativeShare) {
const type = share.type === "song" ? "album" : share.type
const id =
share.type === "album" || share.type === "song"
? share.albumId
: share.type === "artist"
? share.artistId
: share.isFavorites
? "favorites"
: share.playlistId
await nativeShare.share(
url,
`${serverUrl.replace(/\/+$/, "")}/api/${type}/${id}/cover?size=512`,
share.title
)
return
}
await Share.share(
Platform.OS === "ios" ? { url } : { message: url }
Platform.OS === "ios"
? { url, title: share.title }
: { message: url, title: share.title }
)
} catch (error) {
if (error instanceof Error && /cancel/i.test(error.message)) {
+53
View File
@@ -0,0 +1,53 @@
package com.abunchofknowitalls.otunes
import android.content.ClipData
import android.content.Intent
import androidx.core.content.FileProvider
import expo.modules.kotlin.modules.Module
import expo.modules.kotlin.modules.ModuleDefinition
import java.io.File
import java.net.URL
class MediaLinkShare : Module() {
override fun definition() = ModuleDefinition {
Name("MediaLinkShare")
AsyncFunction("share") { link: String, artwork: String, title: String ->
val context = requireNotNull(appContext.reactContext)
val intent = Intent(Intent.ACTION_SEND).apply {
type = "text/plain"
putExtra(Intent.EXTRA_TEXT, link)
putExtra(Intent.EXTRA_TITLE, title)
putExtra(Intent.EXTRA_SUBJECT, title)
}
// ClipData supplies the chooser thumbnail while the shared item stays a URL.
try {
val connection = URL(artwork).openConnection().apply {
connectTimeout = 8000
readTimeout = 8000
}
context.cacheDir.listFiles()?.filter {
it.name.startsWith("media-link-cover-") && it.lastModified() < System.currentTimeMillis() - 86400000
}?.forEach { it.delete() }
val extension = when (connection.contentType?.substringBefore(";")) {
"image/webp" -> "webp"
"image/png" -> "png"
"image/jpeg" -> "jpg"
"image/gif" -> "gif"
else -> error("Artwork format is not supported")
}
val file = File(context.cacheDir, "media-link-cover-${java.util.UUID.randomUUID()}.${extension}")
connection.getInputStream().use { input ->
file.outputStream().use { output -> input.copyTo(output) }
}
val uri = FileProvider.getUriForFile(context, context.packageName + ".SharingFileProvider", file)
intent.clipData = ClipData.newUri(context.contentResolver, "Artwork", uri)
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
} catch (_: Exception) {
// A failed artwork download must not prevent sharing the link.
}
appContext.throwingActivity.runOnUiThread {
appContext.throwingActivity.startActivity(Intent.createChooser(intent, "Share"))
}
}
}
}
+55
View File
@@ -0,0 +1,55 @@
import UIKit
import LinkPresentation
internal import ExpoModulesCore
private final class MediaLinkItem: NSObject, UIActivityItemSource {
let url: URL
let image: UIImage?
let title: String
init(url: URL, image: UIImage?, title: String) {
self.url = url
self.image = image
self.title = title
}
func activityViewControllerPlaceholderItem(_ controller: UIActivityViewController) -> Any { url }
func activityViewController(_ controller: UIActivityViewController, itemForActivityType: UIActivity.ActivityType?) -> Any? { url }
func activityViewControllerLinkMetadata(_ controller: UIActivityViewController) -> LPLinkMetadata? {
let metadata = LPLinkMetadata()
metadata.originalURL = url
metadata.url = url
metadata.title = title
if let image {
metadata.imageProvider = NSItemProvider(object: image)
metadata.iconProvider = NSItemProvider(object: image)
}
return metadata
}
}
final class MediaLinkShare: Module {
public func definition() -> ExpoModulesCore.ModuleDefinition {
Name("MediaLinkShare")
AsyncFunction("share") { (link: String, artwork: String, title: String) in
guard let url = URL(string: link), let artworkURL = URL(string: artwork) else { return }
var image: UIImage?
var request = URLRequest(url: artworkURL)
request.timeoutInterval = 8
if let (data, response) = try? await URLSession.shared.data(for: request),
(response as? HTTPURLResponse)?.statusCode == 200 {
image = UIImage(data: data)
}
let artworkImage = image
await MainActor.run {
guard let presenter = self.appContext?.utilities?.currentViewController() else { return }
let controller = UIActivityViewController(
activityItems: [MediaLinkItem(url: url, image: artworkImage, title: title)], applicationActivities: nil)
if let popover = controller.popoverPresentationController {
popover.sourceView = presenter.view
popover.sourceRect = CGRect(x: presenter.view.bounds.midX, y: presenter.view.bounds.midY, width: 0, height: 0)
popover.permittedArrowDirections = []
}
presenter.present(controller, animated: true)
}
}
}
}
+1 -1
View File
@@ -389,7 +389,7 @@ export function AlbumView({
return (
<div className="flex h-svh flex-col">
<PageHeader />
<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 min-w-0 max-w-9/10">
+1 -1
View File
@@ -65,7 +65,7 @@ export function ArtistView({
return (
<div className="flex h-svh flex-col">
<PageHeader />
<PageHeader openApp />
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="flex min-w-0 items-center gap-4 px-6 pt-6 pb-8 sm:gap-6">
+15 -3
View File
@@ -1,3 +1,4 @@
import { OpenAppButton } from "@/components/open-app-button"
import { MobileSidebarTrigger } from "@/components/mobile-sidebar-trigger"
import { Skeleton } from "@/components/ui/skeleton"
import { albumGridClassName } from "@/lib/album-grid-classes"
@@ -19,16 +20,27 @@ function LoadingRegion({
)
}
export function PageHeader({ title }: { title?: string }) {
export function PageHeader({
title,
openApp = false,
}: {
title?: string
openApp?: boolean
}) {
return (
<header
className={cn(
"flex shrink-0 items-center gap-2 border-b px-4 py-3",
!title && "md:hidden"
!title && !openApp && "md:hidden"
)}
>
<MobileSidebarTrigger />
{title ? <h1 className="text-lg font-semibold">{title}</h1> : null}
{title ? (
<h1 className="text-lg font-semibold">{title}</h1>
) : openApp ? (
<span className="font-semibold">oTunes</span>
) : null}
{openApp ? <OpenAppButton /> : null}
</header>
)
}
+22
View File
@@ -0,0 +1,22 @@
"use client"
import { ArrowUpRight } from "lucide-react"
export function OpenAppButton() {
function openApp() {
const link = new URL("otunes://open")
link.searchParams.set("url", window.location.href)
window.location.assign(link.href)
}
return (
<button
type="button"
onClick={openApp}
className="ml-auto inline-flex shrink-0 items-center gap-1 text-sm font-medium hover:underline focus-visible:outline-2 focus-visible:outline-offset-4"
>
Open App
<ArrowUpRight aria-hidden className="size-4" />
</button>
)
}
+1 -1
View File
@@ -519,7 +519,7 @@ export function PlaylistView({ playlist }: { playlist: BrowsePlaylistDetail }) {
return (
<div className="flex h-svh flex-col">
<PageHeader />
<PageHeader openApp />
<ScrollArea className="min-h-0 flex-1">
<div className="pb-28">
<div className="mx-auto w-full min-w-0 max-w-9/10">