Mrixs/yandex-music-api-go
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix API endpoints: resource IDs in URL path, not query params

Browse Source 
- artists/{artist_id}/tracks and /direct-albums: artistID in path, return ArtistTracks/ArtistAlbums with pager
- likes: /users/me/likes/{type}s/{add-multiple|remove}, IDs as body params
- queue: /queues/{queue_id}/... instead of /queue/...?queue_id=...
- radio: /rotor/station/{station_id}/info and /tracks
- concerts: /concerts/{concert_id}/info, /concerts/tab-config
- playlists: /users/{user_id}/playlists
- labels: /labels/{label_id}, /albums, /artists
- clips: /clips/will/like, /artists/{artist_id}/blocks/artist-clips
- feed: /landing3/* endpoints

Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
MrixsandClaude Code committed 2026-10-18 08:32:29 +03:00
1 parent 02a6dabcfb
commit 70c2a5cd01
12 files changed
+230 -160
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/client/artists.go
+12 -25
View File
@@ -44,46 +44,33 @@ func (c *Client) GetArtist(ctx context.Context, artistID string) (*models.Artist
}
// GetArtistAlbums gets albums by an artist
func (c *Client) GetArtistAlbums(ctx context.Context, artistID string, page, pageSize int) ([]*models.Album, error) {
// GET /artists/{artist_id}/direct-albums
func (c *Client) GetArtistAlbums(ctx context.Context, artistID string, page, pageSize int) (*models.ArtistAlbums, error) {
params := map[string]string{
"artist-id": artistID,
"page": fmt.Sprintf("%d", page),
"page-size": fmt.Sprintf("%d", pageSize),
}
var result []models.Album
if err := c.request.Get(ctx, "/artists/albums", params, &result); err != nil {
var result models.ArtistAlbums
if err := c.request.Get(ctx, fmt.Sprintf("/artists/%s/direct-albums", artistID), params, &result); err != nil {
return nil, err
}
albums := make([]*models.Album, len(result))
for i := range result {
result[i].SetClient(c)
albums[i] = &result[i]
}
return albums, nil
result.SetClient(c)
return &result, nil
}
// GetArtistTracks gets tracks by an artist
func (c *Client) GetArtistTracks(ctx context.Context, artistID string, page, pageSize int) ([]*models.Track, error) {
// GET /artists/{artist_id}/tracks
func (c *Client) GetArtistTracks(ctx context.Context, artistID string, page, pageSize int) (*models.ArtistTracks, error) {
params := map[string]string{
"artist-id": artistID,
"page": fmt.Sprintf("%d", page),
"page-size": fmt.Sprintf("%d", pageSize),
}
var result []models.Track
if err := c.request.Get(ctx, "/artists/tracks", params, &result); err != nil {
var result models.ArtistTracks
if err := c.request.Get(ctx, fmt.Sprintf("/artists/%s/tracks", artistID), params, &result); err != nil {
return nil, err
}
tracks := make([]*models.Track, len(result))
for i := range result {
result[i].SetClient(c)
tracks[i] = &result[i]
}
return tracks, nil
result.SetClient(c)
return &result, nil
}
// Need to add fmt import
// "fmt"
internal/client/clips.go
+3 -6
View File
@@ -36,20 +36,17 @@ func (c *Client) GetClips(ctx context.Context, page, pageSize int) ([]*models.Cl
// GetClipsWillLike gets clips the user might like
func (c *Client) GetClipsWillLike(ctx context.Context) (*models.ClipsWillLike, error) {
var result models.ClipsWillLike
if err := c.request.Get(ctx, "/clips/will-like", nil, &result); err != nil {
if err := c.request.Get(ctx, "/clips/will/like", nil, &result); err != nil {
return nil, err
}
return &result, nil
}
// GetArtistClips gets clips by an artist
// GET /artists/{artistID}/blocks/artist-clips
func (c *Client) GetArtistClips(ctx context.Context, artistID string) (*models.ArtistClipData, error) {
params := map[string]string{
"artist_id": artistID,
}
var result models.ArtistClipData
if err := c.request.Get(ctx, "/artists/clips", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/artists/%s/blocks/artist-clips", artistID), nil, &result); err != nil {
return nil, err
}
return &result, nil
internal/client/concerts.go
+9 -21
View File
@@ -14,10 +14,10 @@ func (c *Client) GetConcerts(ctx context.Context, page, pageSize int) (*models.C
"page_size": "20",
}
if page > 0 {
params["page"] = fmt.Sprintf("%d", page)
params["page"] = fmt.Sprint(page)
}
if pageSize > 0 {
params["page_size"] = fmt.Sprintf("%d", pageSize)
params["page_size"] = fmt.Sprint(pageSize)
}
var result models.ConcertFeed
@@ -37,13 +37,10 @@ func (c *Client) GetConcertFeed(ctx context.Context) (*models.ConcertFeed, error
}
// GetConcertInfo gets concert info
// GET /concerts/{concertID}/info
func (c *Client) GetConcertInfo(ctx context.Context, concertID string) (*models.ConcertInfo, error) {
params := map[string]string{
"concert_id": concertID,
}
var result models.ConcertInfo
if err := c.request.Get(ctx, "/concerts/info", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/concerts/%s/info", concertID), nil, &result); err != nil {
return nil, err
}
return &result, nil
@@ -59,20 +56,11 @@ func (c *Client) GetConcertLocations(ctx context.Context) (*models.ConcertLocati
}
// GetConcertTabs gets concert tabs
func (c *Client) GetConcertTabs(ctx context.Context, concertID string) ([]*models.ConcertTabConfig, error) {
params := map[string]string{
"concert_id": concertID,
}
var result []models.ConcertTabConfig
if err := c.request.Get(ctx, "/concerts/tabs", params, &result); err != nil {
// GET /concerts/tab-config
func (c *Client) GetConcertTabs(ctx context.Context) (*models.ConcertTabConfig, error) {
var result models.ConcertTabConfig
if err := c.request.Get(ctx, "/concerts/tab-config", nil, &result); err != nil {
return nil, err
}
tabs := make([]*models.ConcertTabConfig, len(result))
for i := range result {
result[i].SetClient(c)
tabs[i] = &result[i]
}
return tabs, nil
return &result, nil
}
internal/client/feed.go
+5 -3
View File
@@ -2,6 +2,7 @@ package client
import (
"context"
"fmt"
"gitea.mrixs.me/Mrixs/yandex-music-api-go/internal/models"
)
@@ -73,13 +74,14 @@ func (c *Client) GetGeneratedPlaylists(ctx context.Context) ([]*models.Generated
}
// GetLanding gets a landing page
// GET /landing3/{landingID}
func (c *Client) GetLanding(ctx context.Context, landingID string) (*models.Landing, error) {
params := map[string]string{
"landing_id": landingID,
}
var result models.Landing
if err := c.request.Get(ctx, "/landing", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/landing3/%s", landingID), params, &result); err != nil {
return nil, err
}
return &result, nil
@@ -88,7 +90,7 @@ func (c *Client) GetLanding(ctx context.Context, landingID string) (*models.Land
// GetLandingList gets a list of landings
func (c *Client) GetLandingList(ctx context.Context) (*models.LandingList, error) {
var result models.LandingList
if err := c.request.Get(ctx, "/landing/list", nil, &result); err != nil {
if err := c.request.Get(ctx, "/landing3/list", nil, &result); err != nil {
return nil, err
}
return &result, nil
@@ -101,7 +103,7 @@ func (c *Client) GetLandingBlocks(ctx context.Context, blockIDs []string) ([]*mo
}
var result []models.LandingBlock
if err := c.request.Get(ctx, "/landing/blocks", params, &result); err != nil {
if err := c.request.Get(ctx, "/landing3/blocks", params, &result); err != nil {
return nil, err
}
internal/client/labels.go
+8 -13
View File
@@ -23,13 +23,10 @@ func (c *Client) GetLabels(ctx context.Context) ([]*models.Label, error) {
}
// GetLabel gets a label by ID
// GET /labels/{labelID}
func (c *Client) GetLabel(ctx context.Context, labelID string) (*models.Label, error) {
params := map[string]string{
"label_id": labelID,
}
var result models.Label
if err := c.request.Get(ctx, "/labels", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/labels/%s", labelID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -37,10 +34,9 @@ func (c *Client) GetLabel(ctx context.Context, labelID string) (*models.Label, e
}
// GetLabelAlbums gets albums for a label
// GET /labels/{labelID}/albums
func (c *Client) GetLabelAlbums(ctx context.Context, labelID string, page, pageSize int) (*models.LabelAlbums, error) {
params := map[string]string{
"label_id": labelID,
}
params := map[string]string{}
if page > 0 {
params["page"] = fmt.Sprintf("%d", page)
}
@@ -49,17 +45,16 @@ func (c *Client) GetLabelAlbums(ctx context.Context, labelID string, page, pageS
}
var result models.LabelAlbums
if err := c.request.Get(ctx, "/labels/albums", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/labels/%s/albums", labelID), params, &result); err != nil {
return nil, err
}
return &result, nil
}
// GetLabelArtists gets artists for a label
// GET /labels/{labelID}/artists
func (c *Client) GetLabelArtists(ctx context.Context, labelID string, page, pageSize int) (*models.LabelArtists, error) {
params := map[string]string{
"label_id": labelID,
}
params := map[string]string{}
if page > 0 {
params["page"] = fmt.Sprintf("%d", page)
}
@@ -68,7 +63,7 @@ func (c *Client) GetLabelArtists(ctx context.Context, labelID string, page, page
}
var result models.LabelArtists
if err := c.request.Get(ctx, "/labels/artists", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/labels/%s/artists", labelID), params, &result); err != nil {
return nil, err
}
return &result, nil
internal/client/likes.go
+32 -20
View File
@@ -8,81 +8,90 @@ import (
)
// LikeTrack likes a track
// POST /users/me/likes/tracks/add-multiple
func (c *Client) LikeTrack(ctx context.Context, trackID string) error {
params := map[string]string{
"track_id": trackID,
"track-ids": trackID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/tracks/add", params, &result)
return c.request.Post(ctx, "/users/me/likes/tracks/add-multiple", params, &result)
}
// UnlikeTrack unlikes a track
// POST /users/me/likes/tracks/remove
func (c *Client) UnlikeTrack(ctx context.Context, trackID string) error {
params := map[string]string{
"track_id": trackID,
"track-ids": trackID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/tracks/remove", params, &result)
return c.request.Post(ctx, "/users/me/likes/tracks/remove", params, &result)
}
// LikeAlbum likes an album
// POST /users/me/likes/albums/add-multiple
func (c *Client) LikeAlbum(ctx context.Context, albumID string) error {
params := map[string]string{
"album_id": albumID,
"album-ids": albumID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/albums/add", params, &result)
return c.request.Post(ctx, "/users/me/likes/albums/add-multiple", params, &result)
}
// UnlikeAlbum unlikes an album
// POST /users/me/likes/albums/remove
func (c *Client) UnlikeAlbum(ctx context.Context, albumID string) error {
params := map[string]string{
"album_id": albumID,
"album-ids": albumID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/albums/remove", params, &result)
return c.request.Post(ctx, "/users/me/likes/albums/remove", params, &result)
}
// LikeArtist likes an artist
// POST /users/me/likes/artists/add-multiple
func (c *Client) LikeArtist(ctx context.Context, artistID string) error {
params := map[string]string{
"artist_id": artistID,
"artist-ids": artistID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/artists/add", params, &result)
return c.request.Post(ctx, "/users/me/likes/artists/add-multiple", params, &result)
}
// UnlikeArtist unlikes an artist
// POST /users/me/likes/artists/remove
func (c *Client) UnlikeArtist(ctx context.Context, artistID string) error {
params := map[string]string{
"artist_id": artistID,
"artist-ids": artistID,
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/artists/remove", params, &result)
return c.request.Post(ctx, "/users/me/likes/artists/remove", params, &result)
}
// LikePlaylist likes a playlist
// POST /users/me/likes/playlists/add-multiple
func (c *Client) LikePlaylist(ctx context.Context, kind int) error {
params := map[string]string{
"kind": fmt.Sprintf("%d", kind),
"playlist-ids": fmt.Sprintf("%d", kind),
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/playlists/add", params, &result)
return c.request.Post(ctx, "/users/me/likes/playlists/add-multiple", params, &result)
}
// UnlikePlaylist unlikes a playlist
// POST /users/me/likes/playlists/remove
func (c *Client) UnlikePlaylist(ctx context.Context, kind int) error {
params := map[string]string{
"kind": fmt.Sprintf("%d", kind),
"playlist-ids": fmt.Sprintf("%d", kind),
}
var result map[string]any
return c.request.Post(ctx, "/users/likes/playlists/remove", params, &result)
return c.request.Post(ctx, "/users/me/likes/playlists/remove", params, &result)
}
// GetLikedTracks gets user's liked tracks
// GET /users/me/likes/tracks
func (c *Client) GetLikedTracks(ctx context.Context) ([]*models.Track, error) {
var result []models.Track
if err := c.request.Get(ctx, "/users/likes/tracks", nil, &result); err != nil {
if err := c.request.Get(ctx, "/users/me/likes/tracks", nil, &result); err != nil {
return nil, err
}
@@ -95,9 +104,10 @@ func (c *Client) GetLikedTracks(ctx context.Context) ([]*models.Track, error) {
}
// GetLikedAlbums gets user's liked albums
// GET /users/me/likes/albums
func (c *Client) GetLikedAlbums(ctx context.Context) ([]*models.Album, error) {
var result []models.Album
if err := c.request.Get(ctx, "/users/likes/albums", nil, &result); err != nil {
if err := c.request.Get(ctx, "/users/me/likes/albums", nil, &result); err != nil {
return nil, err
}
@@ -110,9 +120,10 @@ func (c *Client) GetLikedAlbums(ctx context.Context) ([]*models.Album, error) {
}
// GetLikedArtists gets user's liked artists
// GET /users/me/likes/artists
func (c *Client) GetLikedArtists(ctx context.Context) ([]*models.Artist, error) {
var result []models.Artist
if err := c.request.Get(ctx, "/users/likes/artists", nil, &result); err != nil {
if err := c.request.Get(ctx, "/users/me/likes/artists", nil, &result); err != nil {
return nil, err
}
@@ -125,9 +136,10 @@ func (c *Client) GetLikedArtists(ctx context.Context) ([]*models.Artist, error)
}
// GetLikedPlaylists gets user's liked playlists
// GET /users/me/likes/playlists
func (c *Client) GetLikedPlaylists(ctx context.Context) ([]*models.Playlist, error) {
var result []models.Playlist
if err := c.request.Get(ctx, "/users/likes/playlists", nil, &result); err != nil {
if err := c.request.Get(ctx, "/users/me/likes/playlists", nil, &result); err != nil {
return nil, err
}
internal/client/playlists.go
+2 -5
View File
@@ -53,13 +53,10 @@ func (c *Client) GetPlaylist(ctx context.Context, kind int) (*models.Playlist, e
}
// GetUserPlaylists gets playlists for a user
// GET /users/{userID}/playlists
func (c *Client) GetUserPlaylists(ctx context.Context, userID string) ([]*models.Playlist, error) {
params := map[string]string{
"user-id": userID,
}
var result []models.Playlist
if err := c.request.Get(ctx, "/users/playlists", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/users/%s/playlists", userID), nil, &result); err != nil {
return nil, err
}
internal/client/queue.go
+28 -42
View File
@@ -10,7 +10,7 @@ import (
// GetQueue gets the current queue
func (c *Client) GetQueue(ctx context.Context) (*models.Queue, error) {
var result models.Queue
if err := c.request.Get(ctx, "/queue", nil, &result); err != nil {
if err := c.request.Get(ctx, "/queues", nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -25,7 +25,7 @@ func (c *Client) CreateQueue(ctx context.Context, trackID string, queueType stri
}
var result models.Queue
if err := c.request.Post(ctx, "/queue", params, &result); err != nil {
if err := c.request.Post(ctx, "/queues", params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -33,13 +33,10 @@ func (c *Client) CreateQueue(ctx context.Context, trackID string, queueType stri
}
// GetQueueItem gets a queue item
// GET /queues/{queue_id}
func (c *Client) GetQueueItem(ctx context.Context, queueID string) (*models.QueueItem, error) {
params := map[string]string{
"queue_id": queueID,
}
var result models.QueueItem
if err := c.request.Get(ctx, "/queue/item", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/queues/%s", queueID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -47,15 +44,15 @@ func (c *Client) GetQueueItem(ctx context.Context, queueID string) (*models.Queu
}
// AddToQueue adds a track to the queue
// POST /queues/{queue_id}/add
func (c *Client) AddToQueue(ctx context.Context, queueID, trackID string, position int) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"track_id": trackID,
"position": fmt.Sprintf("%d", position),
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/add", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/add", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -63,14 +60,14 @@ func (c *Client) AddToQueue(ctx context.Context, queueID, trackID string, positi
}
// RemoveFromQueue removes a track from the queue
// DELETE /queues/{queue_id}/remove
func (c *Client) RemoveFromQueue(ctx context.Context, queueID, trackID string) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"track_id": trackID,
}
var result models.Queue
if err := c.request.Delete(ctx, "/queue/remove", params, &result); err != nil {
if err := c.request.Delete(ctx, fmt.Sprintf("/queues/%s/remove", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -78,15 +75,15 @@ func (c *Client) RemoveFromQueue(ctx context.Context, queueID, trackID string) (
}
// ReorderQueue reorders the queue
// PUT /queues/{queue_id}/reorder
func (c *Client) ReorderQueue(ctx context.Context, queueID string, from, to int) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"from": fmt.Sprintf("%d", from),
"to": fmt.Sprintf("%d", to),
}
var result models.Queue
if err := c.request.Put(ctx, "/queue/reorder", params, &result); err != nil {
if err := c.request.Put(ctx, fmt.Sprintf("/queues/%s/reorder", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -94,22 +91,17 @@ func (c *Client) ReorderQueue(ctx context.Context, queueID string, from, to int)
}
// ClearQueue clears the queue
// DELETE /queues/{queue_id}/clear
func (c *Client) ClearQueue(ctx context.Context, queueID string) error {
params := map[string]string{
"queue_id": queueID,
}
var result map[string]any
return c.request.Delete(ctx, "/queue/clear", params, &result)
return c.request.Delete(ctx, fmt.Sprintf("/queues/%s/clear", queueID), nil, &result)
}
// NextTrack moves to the next track in the queue
// POST /queues/{queue_id}/next
func (c *Client) NextTrack(ctx context.Context, queueID string) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/next", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/next", queueID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -117,13 +109,10 @@ func (c *Client) NextTrack(ctx context.Context, queueID string) (*models.Queue,
}
// PreviousTrack moves to the previous track in the queue
// POST /queues/{queue_id}/prev
func (c *Client) PreviousTrack(ctx context.Context, queueID string) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/prev", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/prev", queueID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -131,14 +120,14 @@ func (c *Client) PreviousTrack(ctx context.Context, queueID string) (*models.Que
}
// Seek seeks to a specific position in the current track (in milliseconds)
// POST /queues/{queue_id}/seek
func (c *Client) Seek(ctx context.Context, queueID string, positionMs int) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"position": fmt.Sprintf("%d", positionMs),
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/seek", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/seek", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -147,14 +136,14 @@ func (c *Client) Seek(ctx context.Context, queueID string, positionMs int) (*mod
// SetRepeatMode sets the repeat mode for the queue
// mode can be "off", "one", or "all"
// POST /queues/{queue_id}/repeat
func (c *Client) SetRepeatMode(ctx context.Context, queueID, mode string) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"mode": mode,
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/repeat", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/repeat", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -162,14 +151,14 @@ func (c *Client) SetRepeatMode(ctx context.Context, queueID, mode string) (*mode
}
// SetShuffle enables or disables shuffle for the queue
// POST /queues/{queue_id}/shuffle
func (c *Client) SetShuffle(ctx context.Context, queueID string, enabled bool) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"enabled": fmt.Sprintf("%t", enabled),
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/shuffle", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/shuffle", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -177,14 +166,14 @@ func (c *Client) SetShuffle(ctx context.Context, queueID string, enabled bool) (
}
// SetVolume sets the volume for the queue (0-100)
// POST /queues/{queue_id}/volume
func (c *Client) SetVolume(ctx context.Context, queueID string, volume int) (*models.Queue, error) {
params := map[string]string{
"queue_id": queueID,
"volume": fmt.Sprintf("%d", volume),
}
var result models.Queue
if err := c.request.Post(ctx, "/queue/volume", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/queues/%s/volume", queueID), params, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -192,13 +181,10 @@ func (c *Client) SetVolume(ctx context.Context, queueID string, volume int) (*mo
}
// GetCurrentTrack gets the currently playing track from the queue
// GET /queues/{queue_id}/current
func (c *Client) GetCurrentTrack(ctx context.Context, queueID string) (*models.QueueItem, error) {
params := map[string]string{
"queue_id": queueID,
}
var result models.QueueItem
if err := c.request.Get(ctx, "/queue/current", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/queues/%s/current", queueID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -206,14 +192,14 @@ func (c *Client) GetCurrentTrack(ctx context.Context, queueID string) (*models.Q
}
// GetQueueHistory gets the queue history (recently played tracks)
// GET /queues/{queue_id}/history
func (c *Client) GetQueueHistory(ctx context.Context, queueID string, limit int) ([]*models.QueueItem, error) {
params := map[string]string{
"queue_id": queueID,
"limit": fmt.Sprintf("%d", limit),
}
var result []models.QueueItem
if err := c.request.Get(ctx, "/queue/history", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/queues/%s/history", queueID), params, &result); err != nil {
return nil, err
}
internal/client/radio.go
+15 -25
View File
@@ -23,13 +23,10 @@ func (c *Client) GetRadioStations(ctx context.Context) ([]*models.RadioStation,
}
// GetRadioStation gets a radio station by ID
// GET /rotor/station/{stationID}/info
func (c *Client) GetRadioStation(ctx context.Context, stationID string) (*models.RadioStation, error) {
params := map[string]string{
"station_id": stationID,
}
var result models.RadioStation
if err := c.request.Get(ctx, "/radio/station", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/rotor/station/%s/info", stationID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -37,16 +34,15 @@ func (c *Client) GetRadioStation(ctx context.Context, stationID string) (*models
}
// GetStationTracks gets tracks for a radio station
// GET /rotor/station/{stationID}/tracks
func (c *Client) GetStationTracks(ctx context.Context, stationID string, limit int) (*models.StationTracksResult, error) {
params := map[string]string{
"station_id": stationID,
}
params := map[string]string{}
if limit > 0 {
params["limit"] = fmt.Sprintf("%d", limit)
}
var result models.StationTracksResult
if err := c.request.Get(ctx, "/radio/station/tracks", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/rotor/station/%s/tracks", stationID), params, &result); err != nil {
return nil, err
}
return &result, nil
@@ -68,13 +64,10 @@ func (c *Client) GetRotorStations(ctx context.Context) ([]*models.RotorStation,
}
// GetRotorStation gets a rotor station by ID
// GET /rotor/station/{stationID}/info
func (c *Client) GetRotorStation(ctx context.Context, stationID string) (*models.RotorStation, error) {
params := map[string]string{
"station_id": stationID,
}
var result models.RotorStation
if err := c.request.Get(ctx, "/rotor/station", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/rotor/station/%s/info", stationID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -82,29 +75,25 @@ func (c *Client) GetRotorStation(ctx context.Context, stationID string) (*models
}
// GetRotorStationTracks gets tracks for a rotor station
// GET /rotor/station/{stationID}/tracks
func (c *Client) GetRotorStationTracks(ctx context.Context, stationID string, limit int) (*models.RotorStationTracksResult, error) {
params := map[string]string{
"station_id": stationID,
}
params := map[string]string{}
if limit > 0 {
params["limit"] = fmt.Sprintf("%d", limit)
}
var result models.RotorStationTracksResult
if err := c.request.Get(ctx, "/rotor/station/tracks", params, &result); err != nil {
if err := c.request.Get(ctx, fmt.Sprintf("/rotor/station/%s/tracks", stationID), params, &result); err != nil {
return nil, err
}
return &result, nil
}
// StartRotorSession starts a rotor session
// POST /rotor/station/{stationID}/session/start
func (c *Client) StartRotorSession(ctx context.Context, stationID string) (*models.RotorSession, error) {
params := map[string]string{
"station_id": stationID,
}
var result models.RotorSession
if err := c.request.Post(ctx, "/rotor/session/start", params, &result); err != nil {
if err := c.request.Post(ctx, fmt.Sprintf("/rotor/station/%s/session/start", stationID), nil, &result); err != nil {
return nil, err
}
result.SetClient(c)
@@ -112,6 +101,7 @@ func (c *Client) StartRotorSession(ctx context.Context, stationID string) (*mode
}
// GetRotorSession gets rotor session info
// GET /rotor/session?session_id={sessionID}
func (c *Client) GetRotorSession(ctx context.Context, sessionID string) (*models.RotorSession, error) {
params := map[string]string{
"session_id": sessionID,
@@ -126,13 +116,13 @@ func (c *Client) GetRotorSession(ctx context.Context, sessionID string) (*models
}
// RotorSessionFeedback sends feedback for a rotor session track
// POST /rotor/station/{stationID}/feedback
func (c *Client) RotorSessionFeedback(ctx context.Context, sessionID, trackID, feedbackType string) error {
params := map[string]string{
"session_id": sessionID,
"track_id": trackID,
"feedback": feedbackType, // "like", "dislike", "skip"
}
var result map[string]any
return c.request.Post(ctx, "/rotor/session/feedback", params, &result)
return c.request.Post(ctx, fmt.Sprintf("/rotor/station/%s/feedback", sessionID), params, &result)
}
internal/models/artist_albums.go
+55
View File
@@ -0,0 +1,55 @@
package models
import (
"encoding/json"
)
// ArtistAlbums represents a page of albums by an artist
type ArtistAlbums struct {
BaseModel
Albums []Album `json:"albums"`
Pager *Pager `json:"pager"`
}
// DeJSON deserializes an ArtistAlbums from JSON
func (aa *ArtistAlbums) DeJSON(data []byte, c ClientInterface) (Model, error) {
var raw map[string]json.RawMessage
if err := json.Unmarshal(data, &raw); err != nil {
return nil, err
}
albums := &ArtistAlbums{BaseModel: *NewBaseModel(c)}
if v, ok := raw["albums"]; ok {
var albumList []Album
if err := json.Unmarshal(v, &albumList); err == nil {
albums.Albums = albumList
}
}
if v, ok := raw["pager"]; ok {
var pager Pager
if err := json.Unmarshal(v, &pager); err == nil {
albums.Pager = &pager
}
}
return albums, nil
}
// DeList deserializes a list of ArtistAlbums
func (aa *ArtistAlbums) DeList(data []byte, c ClientInterface) ([]Model, error) {
var rawList []json.RawMessage
if err := json.Unmarshal(data, &rawList); err != nil {
return nil, err
}
result := make([]Model, 0, len(rawList))
for _, item := range rawList {
albums := &ArtistAlbums{BaseModel: *NewBaseModel(c)}
if err := json.Unmarshal(item, albums); err != nil {
continue
}
result = append(result, albums)
}
return result, nil
}
internal/models/artist_tracks.go
+55
View File
@@ -0,0 +1,55 @@
package models
import (
"encoding/json"
)
// ArtistTracks represents a page of tracks by an artist
type ArtistTracks struct {
BaseModel
Tracks []Track `json:"tracks"`
Pager *Pager `json:"pager"`
}
// DeJSON deserializes an ArtistTracks from JSON
func (at *ArtistTracks) DeJSON(data []byte, c ClientInterface) (Model, error) {
var raw map[string]json.RawMessage
if err := json.Unmarshal(data, &raw); err != nil {
return nil, err
}
tracks := &ArtistTracks{BaseModel: *NewBaseModel(c)}
if v, ok := raw["tracks"]; ok {
var trackList []Track
if err := json.Unmarshal(v, &trackList); err == nil {
tracks.Tracks = trackList
}
}
if v, ok := raw["pager"]; ok {
var pager Pager
if err := json.Unmarshal(v, &pager); err == nil {
tracks.Pager = &pager
}
}
return tracks, nil
}
// DeList deserializes a list of ArtistTracks
func (at *ArtistTracks) DeList(data []byte, c ClientInterface) ([]Model, error) {
var rawList []json.RawMessage
if err := json.Unmarshal(data, &rawList); err != nil {
return nil, err
}
result := make([]Model, 0, len(rawList))
for _, item := range rawList {
tracks := &ArtistTracks{BaseModel: *NewBaseModel(c)}
if err := json.Unmarshal(item, tracks); err != nil {
continue
}
result = append(result, tracks)
}
return result, nil
}
yandexmusic/client.go
+6
View File
@@ -240,6 +240,12 @@ type Credits = models.Credits
// Credit represents a credit item
type Credit = models.Credit
// ArtistTracks represents a page of tracks by an artist
type ArtistTracks = models.ArtistTracks
// ArtistAlbums represents a page of albums by an artist
type ArtistAlbums = models.ArtistAlbums
// RadioStation represents a radio station
type RadioStation = models.RadioStation