From 40319ff244fe0d1f016c11251d871b1fe659f5c0 Mon Sep 17 00:00:00 2001
From: azmiao <2362020227@qq.com>
Date: Mon, 2 Nov 2026 13:34:53 +0800
Subject: [PATCH] fix: align playback metadata with queue display

---
 web/src/features/playback/player-bar.tsx | 13 ++++---------
 web/src/features/queue/queue-page.tsx    |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/web/src/features/playback/player-bar.tsx b/web/src/features/playback/player-bar.tsx
index c3d3862..a460ce5 100644
--- a/web/src/features/playback/player-bar.tsx
+++ b/web/src/features/playback/player-bar.tsx
@@ -2,7 +2,6 @@ import { ListMusic, MessageCircle, SkipForward, Volume2, VolumeX } from 'lucide-
 import { useEffect, useRef } from 'react'
 import { roomStore } from '@/core/room'
 import { sourceName } from '@/features/queue'
-import { bookTitle } from '@/shared/lib/book-title'
 import { formatDuration } from '@/shared/lib/time'
 import { useStore } from '@/shared/lib/use-store'
 import { Artwork, AsyncIconButton, IconButton, VolumeInput } from '@/shared/ui'
@@ -66,7 +65,9 @@ export function PlayerBar({ onSkip, onLyrics, onQueue, onChat, queueOpen, chatOp
   const volume = useStore(volumeStore, s => s.volume)
   const muted = useStore(volumeStore, s => s.muted)
   const meta = nowPlaying?.entry.meta
-  const source = nowPlaying && sourceName(nowPlaying.entry.track)
+  const artist = meta?.artist || '未知艺术家'
+  const source = nowPlaying ? sourceName(nowPlaying.entry.track) : undefined
+  const note = nowPlaying?.entry.by ? `${nowPlaying.entry.by.name} 点的歌` : undefined
   return (
     <section className="player-bar" aria-label="播放器">
       <button type="button" className="player-artwork" onClick={onLyrics} aria-label="查看歌词">
@@ -77,13 +78,7 @@ export function PlayerBar({ onSkip, onLyrics, onQueue, onChat, queueOpen, chatOp
           <span className="song-copy">
             <strong className="text-ui-lg truncate">{meta?.title ?? '暂无歌曲'}</strong>
             <span className="text-ui-caption muted truncate">
-              {meta?.artist || '未知艺术家'}
-              {source && meta?.pageUrl && (
-                <>
-                  {' · '}
-                  <a className="player-source" href={meta.pageUrl} target="_blank" rel="noopener noreferrer" aria-label={`在${source}打开${bookTitle(meta.title)}（新标签页）`} title={`在${source}打开（新标签页）`}>{source}</a>
-                </>
-              )}
+              {[artist, source, note].filter(Boolean).join(' · ')}
             </span>
           </span>
         </div>
diff --git a/web/src/features/queue/queue-page.tsx b/web/src/features/queue/queue-page.tsx
index fcbbd7e..173550e 100644
--- a/web/src/features/queue/queue-page.tsx
+++ b/web/src/features/queue/queue-page.tsx
@@ -34,7 +34,7 @@ function QueueCard({ label, entry, className = '' }: { label: string, entry: Ent
       <div className="song-copy">
         <span className="text-ui-xs accent">{song.badge ? `${label} · ${song.badge}` : label}</span>
         <strong className="text-ui-base truncate">{song.title}</strong>
-        <span className="text-ui-sm muted truncate">{song.sourceName ? `${song.artist} · ${song.sourceName}` : song.artist}</span>
+        <span className="text-ui-sm muted truncate">{[song.artist, song.sourceName, song.note].filter(Boolean).join(' · ')}</span>
       </div>
     </div>
   )