mirror of
https://github.com/jeffvli/feishin.git
synced 2026-06-15 16:04:19 +02:00
fix(queue): use song serverId when switching servers
This commit is contained in:
@@ -36,6 +36,7 @@ const BaseItemImage = (
|
|||||||
props: Omit<ImageProps, 'id' | 'src'> & {
|
props: Omit<ImageProps, 'id' | 'src'> & {
|
||||||
id?: null | string;
|
id?: null | string;
|
||||||
itemType: LibraryItem;
|
itemType: LibraryItem;
|
||||||
|
serverId?: null | string;
|
||||||
src?: null | string;
|
src?: null | string;
|
||||||
type?: keyof z.infer<typeof GeneralSettingsSchema>['imageRes'];
|
type?: keyof z.infer<typeof GeneralSettingsSchema>['imageRes'];
|
||||||
},
|
},
|
||||||
@@ -46,6 +47,7 @@ const BaseItemImage = (
|
|||||||
id: props.id,
|
id: props.id,
|
||||||
imageUrl: src,
|
imageUrl: src,
|
||||||
itemType: props.itemType,
|
itemType: props.itemType,
|
||||||
|
serverId: props.serverId || undefined,
|
||||||
type: props.type,
|
type: props.type,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -238,6 +238,7 @@ export const QueueSongTitleCombinedColumn = (props: ItemTableListInnerColumn) =>
|
|||||||
containerClassName={styles.image}
|
containerClassName={styles.image}
|
||||||
id={item?.imageId}
|
id={item?.imageId}
|
||||||
itemType={item?._itemType}
|
itemType={item?._itemType}
|
||||||
|
serverId={item?._serverId}
|
||||||
src={item?.imageUrl}
|
src={item?.imageUrl}
|
||||||
type="table"
|
type="table"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -85,12 +85,14 @@ export const FullScreenPlayerImage = () => {
|
|||||||
const currentImageUrl = useItemImageUrl({
|
const currentImageUrl = useItemImageUrl({
|
||||||
id: currentSong?.imageId || undefined,
|
id: currentSong?.imageId || undefined,
|
||||||
itemType: LibraryItem.SONG,
|
itemType: LibraryItem.SONG,
|
||||||
|
serverId: currentSong?._serverId,
|
||||||
type: 'fullScreenPlayer',
|
type: 'fullScreenPlayer',
|
||||||
});
|
});
|
||||||
|
|
||||||
const nextImageUrl = useItemImageUrl({
|
const nextImageUrl = useItemImageUrl({
|
||||||
id: nextSong?.imageId || undefined,
|
id: nextSong?.imageId || undefined,
|
||||||
itemType: LibraryItem.SONG,
|
itemType: LibraryItem.SONG,
|
||||||
|
serverId: nextSong?._serverId,
|
||||||
type: 'fullScreenPlayer',
|
type: 'fullScreenPlayer',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -124,6 +124,7 @@ export const LeftControls = () => {
|
|||||||
id={currentSong?.imageId}
|
id={currentSong?.imageId}
|
||||||
itemType={LibraryItem.SONG}
|
itemType={LibraryItem.SONG}
|
||||||
loading="eager"
|
loading="eager"
|
||||||
|
serverId={currentSong?._serverId}
|
||||||
type="table"
|
type="table"
|
||||||
/>
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
|
|||||||
Reference in New Issue
Block a user