Merge branch 'develop' into stable

1 files changed, 14 insertions, 10 deletions

diff --git a/src/SMAPI.Web/Framework/Clients/GenericModPage.cs b/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
index 622e6c56..5353c7e1 100644
--- a/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
+++ b/src/SMAPI.Web/Framework/Clients/GenericModPage.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
 
@@ -17,30 +19,31 @@ namespace StardewModdingAPI.Web.Framework.Clients
         public string Id { get; set; }
 
         /// <summary>The mod name.</summary>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>The mod's semantic version number.</summary>
-        public string Version { get; set; }
+        public string? Version { get; set; }
 
         /// <summary>The mod's web URL.</summary>
-        public string Url { get; set; }
+        public string? Url { get; set; }
 
         /// <summary>The mod downloads.</summary>
-        public IModDownload[] Downloads { get; set; } = new IModDownload[0];
+        public IModDownload[] Downloads { get; set; } = Array.Empty<IModDownload>();
 
         /// <summary>The mod availability status on the remote site.</summary>
-        public RemoteModStatus Status { get; set; } = RemoteModStatus.Ok;
+        public RemoteModStatus Status { get; set; } = RemoteModStatus.InvalidData;
 
         /// <summary>A user-friendly error which indicates why fetching the mod info failed (if applicable).</summary>
-        public string Error { get; set; }
+        public string? Error { get; set; }
+
+        /// <summary>Whether the mod data is valid.</summary>
+        [MemberNotNullWhen(true, nameof(IModPage.Name), nameof(IModPage.Url))]
+        public bool IsValid => this.Status == RemoteModStatus.Ok;
 
 
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an empty instance.</summary>
-        public GenericModPage() { }
-
         /// <summary>Construct an instance.</summary>
         /// <param name="site">The mod site containing the mod.</param>
         /// <param name="id">The mod's unique ID within the site.</param>
@@ -55,12 +58,13 @@ namespace StardewModdingAPI.Web.Framework.Clients
         /// <param name="version">The mod's semantic version number.</param>
         /// <param name="url">The mod's web URL.</param>
         /// <param name="downloads">The mod downloads.</param>
-        public IModPage SetInfo(string name, string version, string url, IEnumerable<IModDownload> downloads)
+        public IModPage SetInfo(string name, string? version, string url, IEnumerable<IModDownload> downloads)
         {
             this.Name = name;
             this.Version = version;
             this.Url = url;
             this.Downloads = downloads.ToArray();
+            this.Status = RemoteModStatus.Ok;
 
             return this;
         }