Skip to content

Commit 1693bab

Browse files
authored
Merge pull request #2802 from rimma-kubanova/spotifyAPI
Removed SpotifyAPIService class
2 parents c8b5abf + d3c9793 commit 1693bab

File tree

2 files changed

+26
-190
lines changed

2 files changed

+26
-190
lines changed

Diff for: frontend/js/src/utils/SpotifyAPIService.ts

-186
This file was deleted.

Diff for: frontend/js/src/utils/utils.tsx

+26-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { toast } from "react-toastify";
77
import ReactMarkdown from "react-markdown";
88
import SpotifyPlayer from "../common/brainzplayer/SpotifyPlayer";
99
import YoutubePlayer from "../common/brainzplayer/YoutubePlayer";
10-
import SpotifyAPIService from "./SpotifyAPIService";
1110
import NamePill from "../personal-recommendations/NamePill";
1211
import { GlobalAppContextT } from "./GlobalAppContext";
1312
import APIServiceClass from "./APIService";
@@ -814,6 +813,31 @@ const getAlbumArtFromReleaseMBID = async (
814813
return undefined;
815814
};
816815

816+
const getAlbumArtFromSpotifyTrackID = async (
817+
spotifyTrackID: string,
818+
spotifyUser?: SpotifyUser
819+
): Promise<string | undefined> => {
820+
const APIBaseURI = "https://api.spotify.com/v1";
821+
if (!spotifyUser || !spotifyTrackID) {
822+
return undefined;
823+
}
824+
try {
825+
const response = await fetch(`${APIBaseURI}/tracks/${spotifyTrackID}`, {
826+
method: "GET",
827+
headers: {
828+
Authorization: `Bearer ${spotifyUser?.access_token}`,
829+
},
830+
});
831+
if (response.ok) {
832+
const track: SpotifyTrack = await response.json();
833+
return track.album?.images?.[0]?.url;
834+
}
835+
} catch (error) {
836+
return undefined;
837+
}
838+
return undefined;
839+
};
840+
817841
const getAlbumArtFromListenMetadata = async (
818842
listen: BaseListenFormat,
819843
spotifyUser?: SpotifyUser,
@@ -825,9 +849,7 @@ const getAlbumArtFromListenMetadata = async (
825849
SpotifyPlayer.hasPermissions(spotifyUser)
826850
) {
827851
const trackID = SpotifyPlayer.getSpotifyTrackIDFromListen(listen);
828-
return new SpotifyAPIService(spotifyUser).getAlbumArtFromSpotifyTrackID(
829-
trackID
830-
);
852+
return getAlbumArtFromSpotifyTrackID(trackID, spotifyUser);
831853
}
832854
if (YoutubePlayer.isListenFromThisService(listen)) {
833855
const videoId = YoutubePlayer.getVideoIDFromListen(listen);

0 commit comments

Comments
 (0)