majjo/Vocard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize spotify autoplay

Browse Source
This commit is contained in:
Choco
2023-06-02 19:09:23 +08:00
parent 8cc87a981f
commit d1dce692fd
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
function.py
View File

@@ -173,7 +173,7 @@ async def similar_track(player) -> bool:
tracks = []
if randomTrack.spotify:
tracks = await player.spotifyRelatedTrack(randomTrack.identifier, seed_artists=randomTrack.artistId[0] if randomTrack.artistId else None)
tracks = await player.spotifyRelatedTrack(randomTrack.identifier)
else:
if randomTrack.source != 'youtube':
return False

4
voicelink/player.py
View File

@@ -462,9 +462,9 @@ class Player(VoiceProtocol):
)
for track in tracks ]
async def spotifyRelatedTrack(self, seed_tracks: str, *, seed_artists: str = None):
async def spotifyRelatedTrack(self, seed_tracks: str):
tracks = await self._node._spotify_client.similar_track(seed_tracks=seed_tracks, seed_artists=seed_artists)
tracks = await self._node._spotify_client.similar_track(seed_tracks=seed_tracks)
return [ Track(
track_id=None,

10
voicelink/spotify/client.py
View File

@@ -34,7 +34,6 @@ GRANT_URL = "https://accounts.spotify.com/api/token"
REQUEST_URL = "https://api.spotify.com/v1/{type}s/{id}"
SEARCH_URL = "https://api.spotify.com/v1/search?q={query}&type={type}&limit={limit}"
SUGGESTION_URL = "https://api.spotify.com/v1/recommendations?limit={limit}&seed_tracks={seed_tracks}"
SUGGESTION_URL_WITH_ART = "https://api.spotify.com/v1/recommendations?limit={limit}&seed_artists={seed_artists}&seed_tracks={seed_tracks}"
SPOTIFY_URL_REGEX = re.compile(
r"https?://open.spotify.com/(?P<type>album|playlist|track|artist)/(?P<id>[a-zA-Z0-9]+)"
)
@@ -88,15 +87,12 @@ class Client:
return [ Track(track) for track in data['tracks']['items'] ]
async def similar_track(self, seed_tracks: str, *, seed_artists: str = None, limit: int = 5) -> list:
async def similar_track(self, seed_tracks: str, *, limit: int = 5) -> list:
if not self._bearer_token or time.time() >= self._expiry:
await self._fetch_bearer_token()
if not seed_artists:
request_url = SUGGESTION_URL.format(limit=limit, seed_tracks=seed_tracks)
else:
request_url = SUGGESTION_URL_WITH_ART.format(limit=limit, seed_artists=seed_artists, seed_tracks=seed_tracks)
request_url = SUGGESTION_URL.format(limit=limit, seed_tracks=seed_tracks)
async with self.session.get(request_url, headers=self._bearer_headers) as resp:
if resp.status != 200:
raise SpotifyRequestException(