javier/jellyfin-audio-player
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix typescript with optional return from api call

Browse Source
This commit is contained in:
Lei Nelissen
2024-07-21 22:30:06 +02:00
parent 68c8808188
commit e0177fb89b
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utility/JellyfinApi/album.ts
View File

@@ -18,7 +18,7 @@ const albumParams = new URLSearchParams(albumOptions).toString();
*/ */
export async function retrieveAllAlbums() { export async function retrieveAllAlbums() {
return fetchApi<{ Items: Album[] }>(({ user_id }) => `/Users/${user_id}/Items?${albumParams}`) return fetchApi<{ Items: Album[] }>(({ user_id }) => `/Users/${user_id}/Items?${albumParams}`)
.then((data) => data.Items); .then((data) => data!.Items);
} }
/** /**
@@ -26,10 +26,10 @@ export async function retrieveAllAlbums() {
*/ */
export async function retrieveAlbum(id: string): Promise<Album> { export async function retrieveAlbum(id: string): Promise<Album> {
const Similar = await fetchApi<{ Items: SimilarAlbum[] }>(({ user_id }) => `/Items/${id}/Similar?userId=${user_id}&limit=12`) const Similar = await fetchApi<{ Items: SimilarAlbum[] }>(({ user_id }) => `/Items/${id}/Similar?userId=${user_id}&limit=12`)
.then((albums) => albums.Items.map((a) => a.Id)); .then((albums) => albums!.Items.map((a) => a.Id));
return fetchApi<Album>(({ user_id }) => `/Users/${user_id}/Items/${id}`) return fetchApi<Album>(({ user_id }) => `/Users/${user_id}/Items/${id}`)
.then(album => ({ ...album, Similar })); .then(album => ({ ...album!, Similar }));
} }
const latestAlbumsOptions = { const latestAlbumsOptions = {
@@ -64,5 +64,5 @@ export async function retrieveAlbumTracks(ItemId: string) {
const singleAlbumParams = new URLSearchParams(singleAlbumOptions).toString(); const singleAlbumParams = new URLSearchParams(singleAlbumOptions).toString();
return fetchApi<{ Items: AlbumTrack[] }>(({ user_id }) => `/Users/${user_id}/Items?${singleAlbumParams}`) return fetchApi<{ Items: AlbumTrack[] }>(({ user_id }) => `/Users/${user_id}/Items?${singleAlbumParams}`)
.then((data) => data.Items); .then((data) => data!.Items);
} }

6
src/utility/JellyfinApi/lib.ts
View File

@@ -53,7 +53,8 @@ export async function fetchApi<T>(
const response = await fetch(url, config); const response = await fetch(url, config);
if (__DEV__) { if (__DEV__) {
console.log(`[HTTP][${response.status}]`, url, config); console.log(`%c[HTTP] → [${response.status}] ${url}`, 'font-weight:bold;');
console.log('\t', config);
} }
// GUARD: Check if the response is as expected // GUARD: Check if the response is as expected
@@ -88,7 +89,8 @@ export async function fetchApi<T>(
*/ */
export function getImage(ItemId: string): string { export function getImage(ItemId: string): string {
const credentials = asyncFetchStore().getState().settings.jellyfin; const credentials = asyncFetchStore().getState().settings.jellyfin;
return encodeURI(`${credentials?.uri}/Items/${ItemId}/Images/Primary?format=jpeg`); const uri = encodeURI(`${credentials?.uri}/Items/${ItemId}/Images/Primary?format=jpeg`);
return uri;
} }
/** /**

4
src/utility/JellyfinApi/playlist.ts
View File

@@ -19,7 +19,7 @@ export async function retrieveAllPlaylists() {
const playlistParams = new URLSearchParams(playlistOptions).toString(); const playlistParams = new URLSearchParams(playlistOptions).toString();
return fetchApi<{ Items: Playlist[] }>(({ user_id }) => `/Users/${user_id}/Items?${playlistParams}`) return fetchApi<{ Items: Playlist[] }>(({ user_id }) => `/Users/${user_id}/Items?${playlistParams}`)
.then((d) => d.Items); .then((d) => d!.Items);
} }
/** /**
@@ -34,5 +34,5 @@ export async function retrievePlaylistTracks(ItemId: string) {
const singlePlaylistParams = new URLSearchParams(singlePlaylistOptions).toString(); const singlePlaylistParams = new URLSearchParams(singlePlaylistOptions).toString();
return fetchApi<{ Items: AlbumTrack[] }>(`/Playlists/${ItemId}/Items?${singlePlaylistParams}`) return fetchApi<{ Items: AlbumTrack[] }>(`/Playlists/${ItemId}/Items?${singlePlaylistParams}`)
.then((d) => d.Items); .then((d) => d!.Items);
} }

2
src/utility/JellyfinApi/search.ts
View File

@@ -22,7 +22,7 @@ export async function searchItem(
const results = await fetchApi<{ Items: (Album | AlbumTrack)[]}>(({ user_id }) => `/Users/${user_id}/Items?${params}`); const results = await fetchApi<{ Items: (Album | AlbumTrack)[]}>(({ user_id }) => `/Users/${user_id}/Items?${params}`);
return results.Items return results!.Items
.filter((item) => ( .filter((item) => (
// GUARD: Ensure that we're either dealing with an album or a track from an album. // GUARD: Ensure that we're either dealing with an album or a track from an album.
item.Type === 'MusicAlbum' || (item.Type === 'Audio' && item.AlbumId) item.Type === 'MusicAlbum' || (item.Type === 'Audio' && item.AlbumId)

2
src/utility/JellyfinApi/track.ts
View File

@@ -77,5 +77,5 @@ const trackParams = {
*/ */
export async function retrieveAllTracks() { export async function retrieveAllTracks() {
return fetchApi<{ Items: AlbumTrack[] }>(({ user_id }) => `/Users/${user_id}/Items?${trackParams}`) return fetchApi<{ Items: AlbumTrack[] }>(({ user_id }) => `/Users/${user_id}/Items?${trackParams}`)
.then((d) => d.Items); .then((d) => d!.Items);
} }