Merge branch 'develop' into stable

2 files changed, 31 insertions, 4 deletions

diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs b/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
index 2aafe199..8a9c0a25 100644
--- a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
+++ b/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs
@@ -18,9 +18,15 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         /// <summary>The latest unofficial version, if newer than <see cref="Main"/> and <see cref="Optional"/>.</summary>
         public ModEntryVersionModel Unofficial { get; set; }
 
+        /// <summary>The latest unofficial version for the current Stardew Valley or SMAPI beta, if any (see <see cref="HasBetaInfo"/>).</summary>
+        public ModEntryVersionModel UnofficialForBeta { get; set; }
+
         /// <summary>Optional extended data which isn't needed for update checks.</summary>
         public ModExtendedMetadataModel Metadata { get; set; }
 
+        /// <summary>Whether a Stardew Valley or SMAPI beta which affects mod compatibility is in progress. If this is true, <see cref="UnofficialForBeta"/> should be used for beta versions of SMAPI instead of <see cref="Unofficial"/>.</summary>
+        public bool HasBetaInfo { get; set; }
+
         /// <summary>The errors that occurred while fetching update data.</summary>
         public string[] Errors { get; set; } = new string[0];
     }
diff --git a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
index 21376b36..247730d7 100644
--- a/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
+++ b/src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
@@ -13,6 +13,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         /*********
         ** Accessors
         *********/
+        /****
+        ** Mod info
+        ****/
         /// <summary>The mod's unique ID. A mod may have multiple current IDs in rare cases (e.g. due to parallel releases or unofficial updates).</summary>
         public string[] ID { get; set; } = new string[0];
 
@@ -34,6 +37,9 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         /// <summary>The custom mod page URL (if applicable).</summary>
         public string CustomUrl { get; set; }
 
+        /****
+        ** Stable compatibility
+        ****/
         /// <summary>The compatibility status.</summary>
         [JsonConverter(typeof(StringEnumConverter))]
         public WikiCompatibilityStatus? CompatibilityStatus { get; set; }
@@ -42,6 +48,17 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         public string CompatibilitySummary { get; set; }
 
 
+        /****
+        ** Beta compatibility
+        ****/
+        /// <summary>The compatibility status for the Stardew Valley beta (if any).</summary>
+        [JsonConverter(typeof(StringEnumConverter))]
+        public WikiCompatibilityStatus? BetaCompatibilityStatus { get; set; }
+
+        /// <summary>The human-readable summary of the compatibility status or workaround for the Stardew Valley beta (if any), without HTML formatitng.</summary>
+        public string BetaCompatibilitySummary { get; set; }
+
+
         /*********
         ** Public methods
         *********/
@@ -51,20 +68,24 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.WebApi
         /// <summary>Construct an instance.</summary>
         /// <param name="wiki">The mod metadata from the wiki (if available).</param>
         /// <param name="db">The mod metadata from SMAPI's internal DB (if available).</param>
-        public ModExtendedMetadataModel(WikiCompatibilityEntry wiki, ModDataRecord db)
+        public ModExtendedMetadataModel(WikiModEntry wiki, ModDataRecord db)
         {
             // wiki data
             if (wiki != null)
             {
                 this.ID = wiki.ID;
-                this.Name = wiki.Name;
+                this.Name = wiki.Name.FirstOrDefault();
                 this.NexusID = wiki.NexusID;
                 this.ChucklefishID = wiki.ChucklefishID;
                 this.GitHubRepo = wiki.GitHubRepo;
                 this.CustomSourceUrl = wiki.CustomSourceUrl;
                 this.CustomUrl = wiki.CustomUrl;
-                this.CompatibilityStatus = wiki.Status;
-                this.CompatibilitySummary = wiki.Summary;
+
+                this.CompatibilityStatus = wiki.Compatibility.Status;
+                this.CompatibilitySummary = wiki.Compatibility.Summary;
+
+                this.BetaCompatibilityStatus = wiki.BetaCompatibility?.Status;
+                this.BetaCompatibilitySummary = wiki.BetaCompatibility?.Summary;
             }
 
             // internal DB data