Обновлены модели, исправлено получение пользовательских списков.

K1llMan · Dec 11, 2021 · c3e66eb · c3e66eb
1 parent 65ab892
commit c3e66eb
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 9 deletions.
diff --git a/Yandex.Music.Api/API/YPlaylistAPI.cs b/Yandex.Music.Api/API/YPlaylistAPI.cs
@@ -31,8 +31,8 @@ private async Task<YResponse<YPlaylist>> GetPersonalPlaylist(AuthStorage storage
                 .ContinueWith(list =>
                 {
                     YPlaylist playlist = list.GetAwaiter().GetResult().Result.Blocks
-                        .FirstOrDefault(b => b.Type == "personal-playlists")
-                        ?.Entities
+                        .Where(b => b.Type == "personal-playlists")
+                        .SelectMany(b => b.Entities)
                         .FirstOrDefault(e => e.Data.Type == type)
                         ?.Data
                         .Data;
@@ -247,7 +247,7 @@ public YResponse<YPlaylist> Podcasts(AuthStorage storage)
         /// <returns></returns>
         public async Task<YResponse<YPlaylist>> RewindAsync(AuthStorage storage)
         {
-            return await GetPersonalPlaylist(storage, YGeneratedPlaylistType.Rewind20);
+            return await GetPersonalPlaylist(storage, YGeneratedPlaylistType.Rewind21);
         }
 
         /// <summary>

diff --git a/Yandex.Music.Api/Models/Account/YAccountResult.cs b/Yandex.Music.Api/Models/Account/YAccountResult.cs
@@ -10,6 +10,7 @@ public class YAccountResult
 
         public YAccount Account { get; set; }
         public string DefaultEmail { get; set; }
+        public YMasterHub MasterHub { get; set; }
         public YPermissions Permissions { get; set; }
         public YPlus Plus { get; set; }
         public bool PretrialActive { get; set; }

diff --git a/Yandex.Music.Api/Models/Account/YBar.cs b/Yandex.Music.Api/Models/Account/YBar.cs
@@ -1,4 +1,6 @@
-namespace Yandex.Music.Api.Models.Account
+using Yandex.Music.Api.Models.Common;
+
+namespace Yandex.Music.Api.Models.Account
 {
     public class YBar
     {

diff --git a/Yandex.Music.Api/Models/Album/YAlbum.cs b/Yandex.Music.Api/Models/Album/YAlbum.cs
@@ -8,6 +8,7 @@ namespace Yandex.Music.Api.Models.Album
 {
     public class YAlbum : YBaseModel
     {
+        public YButton ActionButton { get; set; }
         public List<YArtist> Artists { get; set; }
         public bool Available { get; set; }
         public bool AvailableForMobile { get; set; }

diff --git a/Yandex.Music.Api/Models/Artist/YArtist.cs b/Yandex.Music.Api/Models/Artist/YArtist.cs
@@ -9,6 +9,7 @@ namespace Yandex.Music.Api.Models.Artist
 {
     public class YArtist : YBaseModel
     {
+        public YButton ActionButton { get; set; }
         public bool Available { get; set; }
         public bool Composer { get; set; }
         public List<string> Countries { get; set; }

diff --git a/Yandex.Music.Api/Models/Artist/YArtistBriefInfo.cs b/Yandex.Music.Api/Models/Artist/YArtistBriefInfo.cs
@@ -12,6 +12,7 @@ namespace Yandex.Music.Api.Models.Artist
 {
     public class YArtistBriefInfo
     {
+        public YButton ActionButton { get; set; }
         public List<YAlbum> Albums { get; set; }
         [JsonProperty(ItemConverterType = typeof(YCoverConverter))]
         public List<YCover> AllCovers { get; set; }

diff --git a/Yandex.Music.Api/Models/Account/YButton.cs → Yandex.Music.Api/Models/Common/YButton.cs b/Yandex.Music.Api/Models/Account/YButton.cs → Yandex.Music.Api/Models/Common/YButton.cs
@@ -1,10 +1,11 @@
-namespace Yandex.Music.Api.Models.Account
+namespace Yandex.Music.Api.Models.Common
 {
     public class YButton
     {
         public string Text { get; set; }
         public string BgColor { get; set; }
         public string TextColor { get; set; }
-        public string Uri { get; set; }
+        public string Url { get; set; }
+        public string Color { get; set; }
     }
 }
diff --git a/Yandex.Music.Api/Models/Common/YMasterHub.cs b/Yandex.Music.Api/Models/Common/YMasterHub.cs
@@ -0,0 +1,8 @@
+namespace Yandex.Music.Api.Models.Common
+{
+    public class YMasterHub
+    {
+        public YSubscription[] ActiveSubscriptions { get; set; }
+        public YSubscription[] AvailableSubscriptions { get; set; }
+    }
+}
diff --git a/Yandex.Music.Api/Models/Landing/YLandingBlockEntityData.cs b/Yandex.Music.Api/Models/Landing/YLandingBlockEntityData.cs
@@ -11,6 +11,7 @@ public class YLandingBlockEntityData
         public YPlaylist Data { get; set; }
         public List<string> Description { get; set; }
         public bool Notify { get; set; }
+        public string PreviewDescription { get; set; }
         public bool Ready { get; set; }
         public YGeneratedPlaylistType Type { get; set; }
 

diff --git a/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs b/Yandex.Music.Api/Models/Playlist/YGeneratedPlaylistType.cs
@@ -4,6 +4,11 @@ public enum YGeneratedPlaylistType
     {
         None,
 
+        /// <summary>
+        /// Редакторский список
+        /// </summary>
+        Editorial,
+
         /// <summary>
         /// Плейлист дня
         /// </summary>
@@ -37,6 +42,6 @@ public enum YGeneratedPlaylistType
         /// <summary>
         /// Большая перемотка
         /// </summary>
-        Rewind20,
+        Rewind21,
     }
 }
diff --git a/Yandex.Music.Api/Models/Playlist/YPlaylist.cs b/Yandex.Music.Api/Models/Playlist/YPlaylist.cs
@@ -25,6 +25,7 @@ public YPlaylistUidPair GetKey()
 
         #region Ñâîéñòâà
 
+        public YButton ActionButton { get; set; }
         public string AnimatedCoverUri { get; set; }
         public bool Available { get; set; }
         public string BackgroundColor { get; set; }

diff --git a/Yandex.Music.Api/Models/Playlist/YPlaylistPlayCounter.cs b/Yandex.Music.Api/Models/Playlist/YPlaylistPlayCounter.cs
@@ -5,8 +5,9 @@ public class YPlaylistPlayCounter
         #region Ñâîéñòâà
 
         public string Description { get; set; }
-        public bool? Updated { get; set; }
-        public int? Value { get; set; }
+        public string DescriptionNext { get; set; }
+        public bool Updated { get; set; }
+        public int?Value { get; set; }
 
         #endregion
     }

diff --git a/Yandex.Music.Api/Models/Radio/YStation.cs b/Yandex.Music.Api/Models/Radio/YStation.cs
@@ -7,6 +7,7 @@ namespace Yandex.Music.Api.Models.Radio
     public class YStation : YBaseModel
     {
         public YAdParams AdParams { get; set; }
+        public string CustomName { get; set; }
         public YStationData Data { get; set; }
         public string Explanation { get; set; }
         public List<YPrerolls> Prerolls { get; set; }

diff --git a/Yandex.Music.Api/Models/Track/YTrack.cs b/Yandex.Music.Api/Models/Track/YTrack.cs
@@ -43,8 +43,10 @@ public YTrackAlbumPair GetKey()
         public YTrackNormalization Normalization { get; set; }
         public YTrackNormalizationR128 R128 { get; set; }
         public string OgImage { get; set; }
+        public string PlayerId { get; set; }
         public long PreviewDurationMs { get; set; }
         public YPodcastEpisodeType PodcastEpisodeType { get; set; }
+        public DateTime PubDate { get; set; }
         public string RealId { get; set; }
         public bool RememberPosition { get; set; }
         public string ShortDescription { get; set; }