bugfixes

jeffvli · Mar 28, 2024 · 842e5ff · 842e5ff
1 parent 22f320e
commit 842e5ff
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/renderer/api/navidrome/navidrome-controller.ts b/src/renderer/api/navidrome/navidrome-controller.ts
@@ -484,9 +484,11 @@ const removeFromPlaylist = async (
     return null;
 };
 
+// The order should be in decreasing version, as the highest version match
+// will automatically consider all lower versions matched
 const VERSION_INFO: Array<[string, Record<string, number[]>]> = [
-    ['0.48.0', { [ServerFeature.PLAYLISTS_SMART]: [1] }],
     ['0.49.3', { [ServerFeature.SHARING_ALBUM_SONG]: [1] }],
+    ['0.48.0', { [ServerFeature.PLAYLISTS_SMART]: [1] }],
 ];
 
 const getFeatures = (version: string): Record<string, number[]> => {
@@ -545,7 +547,7 @@ const getServerInfo = async (args: ServerInfoArgs): Promise<ServerInfo> => {
     const features: ServerFeatures = {
         lyricsMultipleStructured: !!navidromeFeatures[SubsonicExtensions.SONG_LYRICS],
         playlistsSmart: !!navidromeFeatures[NavidromeExtensions.SMART_PLAYLISTS],
-        sharingAlbumSong: !!navidromeFeatures[NavidromeExtensions.SHARING],
+        sharingAlbumSong: !!navidromeFeatures[ServerFeature.SHARING_ALBUM_SONG],
     };
 
     return { features, id: apiClientProps.server?.id, version: ping.body.serverVersion! };

diff --git a/src/renderer/api/navidrome/navidrome-types.ts b/src/renderer/api/navidrome/navidrome-types.ts
@@ -356,7 +356,6 @@ const shareItemParameters = z.object({
 });
 
 export enum NavidromeExtensions {
-    SHARING = 'sharing',
     SMART_PLAYLISTS = 'smartPlaylists',
 }
 

diff --git a/src/renderer/features/context-menu/context-menu-provider.tsx b/src/renderer/features/context-menu/context-menu-provider.tsx
@@ -79,7 +79,7 @@ const ContextMenuContext = createContext<ContextMenuContextProps>({
     },
 });
 
-const JELLYFIN_IGNORED_MENU_ITEMS: ContextMenuItemType[] = ['setRating'];
+const JELLYFIN_IGNORED_MENU_ITEMS: ContextMenuItemType[] = ['setRating', 'shareItem'];
 // const NAVIDROME_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];
 // const SUBSONIC_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];
 
@@ -795,10 +795,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                 rightIcon: <RiArrowRightSFill size="1.2rem" />,
             },
             shareItem: {
-                disabled: !(
-                    server?.type === ServerType.NAVIDROME &&
-                    hasFeature(server, ServerFeature.SHARING_ALBUM_SONG)
-                ),
+                disabled: !hasFeature(server, ServerFeature.SHARING_ALBUM_SONG),
                 id: 'shareItem',
                 label: t('page.contextMenu.shareItem', { postProcess: 'sentenceCase' }),
                 leftIcon: <RiShareForwardFill size="1.1rem" />,
@@ -858,7 +855,10 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                                                     >
                                                         <HoverCard.Target>
                                                             <ContextMenuButton
-                                                                disabled={item.disabled}
+                                                                disabled={
+                                                                    contextMenuItems[item.id]
+                                                                        .disabled
+                                                                }
                                                                 leftIcon={
                                                                     contextMenuItems[item.id]
                                                                         .leftIcon
@@ -895,7 +895,9 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                                                     </HoverCard>
                                                 ) : (
                                                     <ContextMenuButton
-                                                        disabled={item.disabled}
+                                                        disabled={
+                                                            contextMenuItems[item.id].disabled
+                                                        }
                                                         leftIcon={
                                                             contextMenuItems[item.id].leftIcon
                                                         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -356,7 +356,6 @@ const shareItemParameters = z.object({ @@
     });
     export enum NavidromeExtensions {
-        SHARING = 'sharing',
         SMART_PLAYLISTS = 'smartPlaylists',
     }
@@ Expand Down @@