Доработан поиск и добавление треков
This commit is contained in:
@@ -74,7 +74,7 @@ public class AudioController : ControllerBase
|
||||
|
||||
[HttpGet("track-info/{trackId}")]
|
||||
[AllowAnonymous]
|
||||
public async Task<ActionResult<ApiResponse<TrackInfoDto>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
|
||||
public async Task<ActionResult<ApiResponse<YandexTrack>>> GetTrackInfo(string trackId, [FromQuery] string? access_token = null, [FromQuery] string? shared_id = null)
|
||||
{
|
||||
var user = await GetUserFromToken(access_token);
|
||||
if (user == null) user = await GetUserFromSharedPlaylistId(shared_id);
|
||||
@@ -83,10 +83,12 @@ public class AudioController : ControllerBase
|
||||
var track = await _yandexService.GetYTrackAsync(user, trackId);
|
||||
if (track == null) return NotFound();
|
||||
|
||||
return Ok(ApiResponse<TrackInfoDto>.Ok(new TrackInfoDto
|
||||
return Ok(ApiResponse<YandexTrack>.Ok(new YandexTrack
|
||||
{
|
||||
Title = track.Title,
|
||||
CoverUri = track.CoverUri,
|
||||
Artists = track.Artists.Select(t => t.Name).ToList(),
|
||||
DurationMs = track.DurationMs,
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ public class SharedPlaylistController : ControllerBase
|
||||
Description = playlist.Description ?? "",
|
||||
Tracks = playlist.Tracks?.Select(t => new YandexTrack
|
||||
{
|
||||
Id = t.Track?.Id ?? "",
|
||||
TrackId = t.Track?.Id ?? "",
|
||||
Title = t.Track?.Title ?? "",
|
||||
Artists = t.Track?.Artists?.Select(a => a.Name).ToList() ?? new List<string>(),
|
||||
DurationMs = (int)(t.Track?.DurationMs ?? 0),
|
||||
|
||||
@@ -26,13 +26,13 @@ public class YandexSearchController : ControllerBase
|
||||
}
|
||||
|
||||
[HttpGet("tracks")]
|
||||
public async Task<ActionResult<ApiResponse<List<YandexTrackSearchResult>>>> SearchTracks(
|
||||
public async Task<ActionResult<ApiResponse<List<YandexTrack>>>> SearchTracks(
|
||||
[FromQuery] string query,
|
||||
[FromQuery] int limit = 20,
|
||||
[FromQuery] string? shared_id = null)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(query))
|
||||
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
|
||||
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
|
||||
{
|
||||
StatusCode = 400,
|
||||
Message = "Поисковый запрос не может быть пустым."
|
||||
@@ -62,13 +62,13 @@ public class YandexSearchController : ControllerBase
|
||||
|
||||
var decryptedToken = _yandexService.DecryptToken(user.YandexAccessToken);
|
||||
if (string.IsNullOrEmpty(decryptedToken))
|
||||
return BadRequest(ApiResponse<List<YandexTrackSearchResult>>.Fail(new ErrorResponse
|
||||
return BadRequest(ApiResponse<List<YandexTrack>>.Fail(new ErrorResponse
|
||||
{
|
||||
StatusCode = 400,
|
||||
Message = "Токен Яндекс.Музыки не установлен или недействителен."
|
||||
}));
|
||||
|
||||
var results = await _yandexService.SearchTracksAsync(user, query, limit);
|
||||
return Ok(ApiResponse<List<YandexTrackSearchResult>>.Ok(results));
|
||||
return Ok(ApiResponse<List<YandexTrack>>.Ok(results));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user