Refactor all mutation hooks

src/renderer/features/player/mutations/scrobble-mutation.ts

@@ -1,18 +1,18 @@
 import { useMutation } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
-import { RawScrobbleResponse, ScrobbleArgs } from '/@/renderer/api/types';
+import { ScrobbleResponse, ScrobbleArgs } from '/@/renderer/api/types';
 import { MutationOptions } from '/@/renderer/lib/react-query';
-import { useAuthStore, useCurrentServer, useIncrementQueuePlayCount } from '/@/renderer/store';
+import { getServerById, useIncrementQueuePlayCount } from '/@/renderer/store';
 
 export const useSendScrobble = (options?: MutationOptions) => {
-  const currentServer = useCurrentServer();
   const incrementPlayCount = useIncrementQueuePlayCount();
 
-  return useMutation<RawScrobbleResponse, HTTPError, Omit<ScrobbleArgs, 'server'>, null>({
+  return useMutation<ScrobbleResponse, HTTPError, Omit<ScrobbleArgs, 'server'>, null>({
     mutationFn: (args) => {
-      const server = useAuthStore.getState().actions.getServer(args._serverId) || currentServer;
+      const server = getServerById(args.serverId);
-      return api.controller.scrobble({ ...args, server });
+      if (!server) throw new Error('Server not found');
+      return api.controller.scrobble({ ...args, apiClientProps: { server } });
     },
     onSuccess: (_data, variables) => {
       // Manually increment the play count for the song in the queue if scrobble was submitted

src/renderer/features/playlists/mutations/add-to-playlist-mutation.ts

@@ -2,25 +2,31 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { AddToPlaylistArgs, RawAddToPlaylistResponse } from '/@/renderer/api/types';
+import { AddToPlaylistArgs, AddToPlaylistResponse } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+import { getServerById } from '/@/renderer/store';
 
-export const useAddToPlaylist = (options?: MutationOptions) => {
+export const useAddToPlaylist = (args: MutationHookArgs) => {
+  const { options } = args || {};
   const queryClient = useQueryClient();
-  const server = useCurrentServer();
 
-  return useMutation<RawAddToPlaylistResponse, HTTPError, Omit<AddToPlaylistArgs, 'server'>, null>({
+  return useMutation<
-    mutationFn: (args) => api.controller.addToPlaylist({ ...args, server }),
+    AddToPlaylistResponse,
+    HTTPError,
+    Omit<AddToPlaylistArgs, 'server' | 'apiClientProps'>,
+    null
+  >({
+    mutationFn: (args) => {
+      const server = getServerById(args.serverId);
+      if (!server) throw new Error('Server not found');
+      return api.controller.addToPlaylist({ ...args, apiClientProps: { server } });
+    },
     onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries(queryKeys.playlists.list(server?.id || ''), { exact: false });
+      const { serverId } = variables;
-
+      queryClient.invalidateQueries(queryKeys.playlists.list(serverId), { exact: false });
+      queryClient.invalidateQueries(queryKeys.playlists.detail(serverId, variables.query.id));
       queryClient.invalidateQueries(
-        queryKeys.playlists.detail(server?.id || '', variables.query.id),
+        queryKeys.playlists.detailSongList(serverId, variables.query.id),
-      );
-
-      queryClient.invalidateQueries(
-        queryKeys.playlists.detailSongList(server?.id || '', variables.query.id),
       );
     },
     ...options,

src/renderer/features/playlists/mutations/create-playlist-mutation.ts

@@ -2,23 +2,28 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { CreatePlaylistArgs, RawCreatePlaylistResponse } from '/@/renderer/api/types';
+import { CreatePlaylistArgs, CreatePlaylistResponse } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+import { getServerById } from '/@/renderer/store';
 
-export const useCreatePlaylist = (options?: MutationOptions) => {
+export const useCreatePlaylist = (args: MutationHookArgs) => {
+  const { options } = args || {};
   const queryClient = useQueryClient();
-  const server = useCurrentServer();
 
   return useMutation<
-    RawCreatePlaylistResponse,
+    CreatePlaylistResponse,
     HTTPError,
-    Omit<CreatePlaylistArgs, 'server'>,
+    Omit<CreatePlaylistArgs, 'server' | 'apiClientProps'>,
     null
   >({
-    mutationFn: (args) => api.controller.createPlaylist({ ...args, server }),
+    mutationFn: (args) => {
-    onSuccess: () => {
+      const server = getServerById(args.serverId);
-      queryClient.invalidateQueries(queryKeys.playlists.list(server?.id || ''), { exact: false });
+      if (!server) throw new Error('Server not found');
+      return api.controller.createPlaylist({ ...args, apiClientProps: { server } });
+    },
+    onSuccess: (_data, variables) => {
+      const serverId = variables.serverId;
+      queryClient.invalidateQueries(queryKeys.playlists.list(serverId), { exact: false });
     },
     ...options,
   });

src/renderer/features/playlists/mutations/delete-playlist-mutation.ts

@@ -2,21 +2,26 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { DeletePlaylistArgs, RawDeletePlaylistResponse } from '/@/renderer/api/types';
+import { DeletePlaylistArgs, DeletePlaylistResponse } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+import { getServerById, useCurrentServer } from '/@/renderer/store';
 
-export const useDeletePlaylist = (options?: MutationOptions) => {
+export const useDeletePlaylist = (args: MutationHookArgs) => {
+  const { options } = args || {};
   const queryClient = useQueryClient();
   const server = useCurrentServer();
 
   return useMutation<
-    RawDeletePlaylistResponse,
+    DeletePlaylistResponse,
     HTTPError,
-    Omit<DeletePlaylistArgs, 'server'>,
+    Omit<DeletePlaylistArgs, 'server' | 'apiClientProps'>,
     null
   >({
-    mutationFn: (args) => api.controller.deletePlaylist({ ...args, server }),
+    mutationFn: (args) => {
+      const server = getServerById(args.serverId);
+      if (!server) throw new Error('Server not found');
+      return api.controller.deletePlaylist({ ...args, apiClientProps: { server } });
+    },
     onMutate: () => {
       queryClient.cancelQueries(queryKeys.playlists.list(server?.id || ''));
       return null;

src/renderer/features/playlists/mutations/remove-from-playlist-mutation.ts

@@ -2,30 +2,30 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { RawRemoveFromPlaylistResponse, RemoveFromPlaylistArgs } from '/@/renderer/api/types';
+import { RemoveFromPlaylistResponse, RemoveFromPlaylistArgs } from '/@/renderer/api/types';
 import { MutationOptions } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+import { getServerById } from '/@/renderer/store';
 
 export const useRemoveFromPlaylist = (options?: MutationOptions) => {
   const queryClient = useQueryClient();
-  const server = useCurrentServer();
 
   return useMutation<
-    RawRemoveFromPlaylistResponse,
+    RemoveFromPlaylistResponse,
     HTTPError,
-    Omit<RemoveFromPlaylistArgs, 'server'>,
+    Omit<RemoveFromPlaylistArgs, 'server' | 'apiClientProps'>,
     null
   >({
-    mutationFn: (args) => api.controller.removeFromPlaylist({ ...args, server }),
+    mutationFn: (args) => {
+      const server = getServerById(args.serverId);
+      if (!server) throw new Error('Server not found');
+      return api.controller.removeFromPlaylist({ ...args, apiClientProps: { server } });
+    },
     onSuccess: (_data, variables) => {
-      queryClient.invalidateQueries(queryKeys.playlists.list(server?.id || ''), { exact: false });
+      const { serverId } = variables;
-
+      queryClient.invalidateQueries(queryKeys.playlists.list(serverId), { exact: false });
+      queryClient.invalidateQueries(queryKeys.playlists.detail(serverId, variables.query.id));
       queryClient.invalidateQueries(
-        queryKeys.playlists.detail(server?.id || '', variables.query.id),
+        queryKeys.playlists.detailSongList(serverId, variables.query.id),
-      );
-
-      queryClient.invalidateQueries(
-        queryKeys.playlists.detailSongList(server?.id || '', variables.query.id),
       );
     },
     ...options,

src/renderer/features/playlists/mutations/update-playlist-mutation.ts

@@ -2,26 +2,26 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { RawUpdatePlaylistResponse, UpdatePlaylistArgs } from '/@/renderer/api/types';
+import { UpdatePlaylistArgs, UpdatePlaylistResponse } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
-import { useCurrentServer } from '/@/renderer/store';
+import { getServerById } from '/@/renderer/store';
 
-export const useUpdatePlaylist = (options?: MutationOptions) => {
+export const useUpdatePlaylist = (args: MutationHookArgs) => {
+  const { options } = args || {};
   const queryClient = useQueryClient();
-  const server = useCurrentServer();
 
-  return useMutation<
+  return useMutation<UpdatePlaylistResponse, HTTPError, Omit<UpdatePlaylistArgs, 'server'>, null>({
-    RawUpdatePlaylistResponse,
+    mutationFn: (args) => {
-    HTTPError,
+      const server = getServerById(args.serverId);
-    Omit<UpdatePlaylistArgs, 'server'>,
+      if (!server) throw new Error('Server not found');
-    null
+      return api.controller.updatePlaylist({ ...args, apiClientProps: { server } });
-  >({
+    },
-    mutationFn: (args) => api.controller.updatePlaylist({ ...args, server }),
+    onSuccess: (_data, variables) => {
-    onSuccess: (data) => {
+      const { query, serverId } = variables;
-      queryClient.invalidateQueries(queryKeys.playlists.list(server?.id || ''));
+      queryClient.invalidateQueries(queryKeys.playlists.list(serverId));
 
-      if (data?.id) {
+      if (query?.id) {
-        queryClient.invalidateQueries(queryKeys.playlists.detail(server?.id || '', data.id));
+        queryClient.invalidateQueries(queryKeys.playlists.detail(serverId, query.id));
       }
     },
     ...options,

src/renderer/features/shared/mutations/create-favorite-mutation.ts

@@ -1,27 +1,35 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
-import { JFAlbumArtistDetail, JFAlbumDetail } from '/@/renderer/api/jellyfin.types';
-import { NDAlbumArtistDetail, NDAlbumDetail } from '/@/renderer/api/navidrome.types';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { SSAlbumArtistDetail, SSAlbumDetail } from '/@/renderer/api/subsonic.types';
-import { FavoriteArgs, LibraryItem, RawFavoriteResponse, ServerType } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
 import {
-  useCurrentServer,
+  AlbumArtistDetailResponse,
-  useSetAlbumListItemDataById,
+  AlbumDetailResponse,
-  useSetQueueFavorite,
+  FavoriteArgs,
-} from '/@/renderer/store';
+  FavoriteResponse,
+  LibraryItem,
+} from '/@/renderer/api/types';
+import { MutationHookArgs, queryClient } from '/@/renderer/lib/react-query';
+import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
 
-export const useCreateFavorite = (options?: MutationOptions) => {
+export const useCreateFavorite = (args?: MutationHookArgs) => {
-  const queryClient = useQueryClient();
+  const { options } = args || {};
-  const server = useCurrentServer();
   const setAlbumListData = useSetAlbumListItemDataById();
   const setQueueFavorite = useSetQueueFavorite();
 
-  return useMutation<RawFavoriteResponse, HTTPError, Omit<FavoriteArgs, 'server'>, null>({
+  return useMutation<
-    mutationFn: (args) => api.controller.createFavorite({ ...args, server }),
+    FavoriteResponse,
+    HTTPError,
+    Omit<FavoriteArgs, 'server' | 'apiClientProps'>,
+    null
+  >({
+    mutationFn: (args) => {
+      const server = getServerById(args.serverId);
+      if (!server) throw new Error('Server not found');
+      return api.controller.createFavorite({ ...args, apiClientProps: { server } });
+    },
     onSuccess: (_data, variables) => {
+      const { serverId } = variables;
       for (const id of variables.query.id) {
         // Set the userFavorite property to true for the album in the album list data store
         if (variables.query.type === LibraryItem.ALBUM) {
@@ -35,71 +43,33 @@ export const useCreateFavorite = (options?: MutationOptions) => {
 
       // We only need to set if we're already on the album detail page
       if (variables.query.type === LibraryItem.ALBUM && variables.query.id.length === 1) {
-        const queryKey = queryKeys.albums.detail(server?.id || '', { id: variables.query.id[0] });
+        const queryKey = queryKeys.albums.detail(serverId, { id: variables.query.id[0] });
-        const previous = queryClient.getQueryData<any>(queryKey);
+        const previous = queryClient.getQueryData<AlbumDetailResponse>(queryKey);
 
         if (previous) {
-          switch (server?.type) {
+          queryClient.setQueryData<AlbumDetailResponse>(queryKey, {
-            case ServerType.NAVIDROME:
+            ...previous,
-              queryClient.setQueryData<NDAlbumDetail>(queryKey, {
+            userFavorite: true,
-                ...previous,
+          });
-                starred: true,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumDetail>(queryKey, {
-                ...previous,
-                starred: true,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              queryClient.setQueryData<JFAlbumDetail>(queryKey, {
-                ...previous,
-                UserData: {
-                  ...previous.UserData,
-                  IsFavorite: true,
-                },
-              });
-              break;
-          }
         }
       }
 
       // We only need to set if we're already on the album detail page
       if (variables.query.type === LibraryItem.ALBUM_ARTIST && variables.query.id.length === 1) {
-        const queryKey = queryKeys.albumArtists.detail(server?.id || '', {
+        const queryKey = queryKeys.albumArtists.detail(serverId, {
           id: variables.query.id[0],
         });
-        const previous = queryClient.getQueryData<any>(queryKey);
+
+        const previous = queryClient.getQueryData<AlbumArtistDetailResponse>(queryKey);
 
         if (previous) {
-          switch (server?.type) {
+          queryClient.setQueryData<AlbumArtistDetailResponse>(queryKey, {
-            case ServerType.NAVIDROME:
+            ...previous,
-              queryClient.setQueryData<NDAlbumArtistDetail>(queryKey, {
+            userFavorite: true,
-                ...previous,
+          });
-                starred: true,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumArtistDetail>(queryKey, {
-                ...previous,
-                starred: true,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              queryClient.setQueryData<JFAlbumArtistDetail>(queryKey, {
-                ...previous,
-                UserData: {
-                  ...previous.UserData,
-                  IsFavorite: true,
-                },
-              });
-              break;
-          }
         }
       }
     },
-
     ...options,
   });
 };

src/renderer/features/shared/mutations/delete-favorite-mutation.ts

@@ -1,27 +1,36 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
-import { JFAlbumArtistDetail, JFAlbumDetail } from '/@/renderer/api/jellyfin.types';
-import { NDAlbumArtistDetail, NDAlbumDetail } from '/@/renderer/api/navidrome.types';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { SSAlbumArtistDetail, SSAlbumDetail } from '/@/renderer/api/subsonic.types';
-import { FavoriteArgs, LibraryItem, RawFavoriteResponse, ServerType } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
 import {
-  useCurrentServer,
+  AlbumArtistDetailResponse,
-  useSetAlbumListItemDataById,
+  AlbumDetailResponse,
-  useSetQueueFavorite,
+  FavoriteArgs,
-} from '/@/renderer/store';
+  FavoriteResponse,
+  LibraryItem,
+} from '/@/renderer/api/types';
+import { MutationHookArgs, queryClient } from '/@/renderer/lib/react-query';
+import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
 
-export const useDeleteFavorite = (options?: MutationOptions) => {
+export const useDeleteFavorite = (args: MutationHookArgs) => {
-  const queryClient = useQueryClient();
+  const { options } = args || {};
-  const server = useCurrentServer();
+  // const queryClient = useQueryClient();
   const setAlbumListData = useSetAlbumListItemDataById();
   const setQueueFavorite = useSetQueueFavorite();
 
-  return useMutation<RawFavoriteResponse, HTTPError, Omit<FavoriteArgs, 'server'>, null>({
+  return useMutation<
-    mutationFn: (args) => api.controller.deleteFavorite({ ...args, server }),
+    FavoriteResponse,
+    HTTPError,
+    Omit<FavoriteArgs, 'server' | 'apiClientProps'>,
+    null
+  >({
+    mutationFn: (args) => {
+      const server = getServerById(args.serverId);
+      if (!server) throw new Error('Server not found');
+      return api.controller.deleteFavorite({ ...args, apiClientProps: { server } });
+    },
     onSuccess: (_data, variables) => {
+      const { serverId } = variables;
       for (const id of variables.query.id) {
         // Set the userFavorite property to false for the album in the album list data store
         if (variables.query.type === LibraryItem.ALBUM) {
@@ -35,67 +44,29 @@ export const useDeleteFavorite = (options?: MutationOptions) => {
 
       // We only need to set if we're already on the album detail page
       if (variables.query.type === LibraryItem.ALBUM && variables.query.id.length === 1) {
-        const queryKey = queryKeys.albums.detail(server?.id || '', { id: variables.query.id[0] });
+        const queryKey = queryKeys.albums.detail(serverId, { id: variables.query.id[0] });
-        const previous = queryClient.getQueryData<any>(queryKey);
+        const previous = queryClient.getQueryData<AlbumDetailResponse>(queryKey);
 
         if (previous) {
-          switch (server?.type) {
+          queryClient.setQueryData<AlbumDetailResponse>(queryKey, {
-            case ServerType.NAVIDROME:
+            ...previous,
-              queryClient.setQueryData<NDAlbumDetail>(queryKey, {
+            userFavorite: false,
-                ...previous,
+          });
-                starred: false,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumDetail>(queryKey, {
-                ...previous,
-                starred: false,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              queryClient.setQueryData<JFAlbumDetail>(queryKey, {
-                ...previous,
-                UserData: {
-                  ...previous.UserData,
-                  IsFavorite: false,
-                },
-              });
-              break;
-          }
         }
       }
 
-      // We only need to set if we're already on the album detail page
+      // We only need to set if we're already on the album artist detail page
       if (variables.query.type === LibraryItem.ALBUM_ARTIST && variables.query.id.length === 1) {
-        const queryKey = queryKeys.albumArtists.detail(server?.id || '', {
+        const queryKey = queryKeys.albumArtists.detail(serverId, {
           id: variables.query.id[0],
         });
-        const previous = queryClient.getQueryData<any>(queryKey);
+        const previous = queryClient.getQueryData<AlbumArtistDetailResponse>(queryKey);
 
         if (previous) {
-          switch (server?.type) {
+          queryClient.setQueryData<AlbumArtistDetailResponse>(queryKey, {
-            case ServerType.NAVIDROME:
+            ...previous,
-              queryClient.setQueryData<NDAlbumArtistDetail>(queryKey, {
+            userFavorite: false,
-                ...previous,
+          });
-                starred: false,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumArtistDetail>(queryKey, {
-                ...previous,
-                starred: false,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              queryClient.setQueryData<JFAlbumArtistDetail>(queryKey, {
-                ...previous,
-                UserData: {
-                  ...previous.UserData,
-                  IsFavorite: false,
-                },
-              });
-              break;
-          }
         }
       }
     },

src/renderer/features/shared/mutations/set-rating-mutation.ts

@@ -9,33 +9,29 @@ import {
   AlbumArtist,
   AnyLibraryItems,
   LibraryItem,
-  RatingArgs,
+  SetRatingArgs,
-  RawRatingResponse,
+  RatingResponse,
   ServerType,
 } from '/@/renderer/api/types';
-import { MutationOptions } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
-import {
+import { getServerById, useSetAlbumListItemDataById, useSetQueueRating } from '/@/renderer/store';
-  useAuthStore,
-  useCurrentServer,
-  useSetAlbumListItemDataById,
-  useSetQueueRating,
-} from '/@/renderer/store';
 
-export const useUpdateRating = (options?: MutationOptions) => {
+export const useSetRating = (args: MutationHookArgs) => {
+  const { options } = args || {};
   const queryClient = useQueryClient();
-  const currentServer = useCurrentServer();
   const setAlbumListData = useSetAlbumListItemDataById();
   const setQueueRating = useSetQueueRating();
 
   return useMutation<
-    RawRatingResponse,
+    RatingResponse,
     HTTPError,
-    Omit<RatingArgs, 'server'>,
+    Omit<SetRatingArgs, 'server' | 'apiClientProps'>,
     { previous: { items: AnyLibraryItems } | undefined }
   >({
     mutationFn: (args) => {
-      const server = useAuthStore.getState().actions.getServer(args._serverId) || currentServer;
+      const server = getServerById(args.serverId);
-      return api.controller.updateRating({ ...args, server });
+      if (!server) throw new Error('Server not found');
+      return api.controller.updateRating({ ...args, apiClientProps: { server } });
     },
     onError: (_error, _variables, context) => {
       for (const item of context?.previous?.items || []) {
@@ -127,7 +123,6 @@ export const useUpdateRating = (options?: MutationOptions) => {
         }
       }
     },
-
     ...options,
   });
 };