Merge branch 'develop' into stable

3 files changed, 29 insertions, 131 deletions

diff --git a/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs
index 06ec58ed..266055a6 100644
--- a/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs
+++ b/src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Net;
 using System.Threading.Tasks;
-using HtmlAgilityPack;
-using Pathoschild.Http.Client;
 using StardewModdingAPI.Common.Models;
+using StardewModdingAPI.Web.Framework.Clients.Chucklefish;
 
 namespace StardewModdingAPI.Web.Framework.ModRepositories
 {
@@ -13,14 +11,8 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         /*********
         ** Properties
         *********/
-        /// <summary>The base URL for the Chucklefish mod site.</summary>
-        private readonly string BaseUrl;
-
-        /// <summary>The URL for a mod page excluding the base URL, where {0} is the mod ID.</summary>
-        private readonly string ModPageUrlFormat;
-
         /// <summary>The underlying HTTP client.</summary>
-        private readonly IClient Client;
+        private readonly IChucklefishClient Client;
 
 
         /*********
@@ -28,15 +20,11 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="vendorKey">The unique key for this vendor.</param>
-        /// <param name="userAgent">The user agent for the API client.</param>
-        /// <param name="baseUrl">The base URL for the Chucklefish mod site.</param>
-        /// <param name="modPageUrlFormat">The URL for a mod page excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
-        public ChucklefishRepository(string vendorKey, string userAgent, string baseUrl, string modPageUrlFormat)
+        /// <param name="client">The underlying HTTP client.</param>
+        public ChucklefishRepository(string vendorKey, IChucklefishClient client)
             : base(vendorKey)
         {
-            this.BaseUrl = baseUrl;
-            this.ModPageUrlFormat = modPageUrlFormat;
-            this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
+            this.Client = client;
         }
 
         /// <summary>Get metadata about a mod in the repository.</summary>
@@ -44,38 +32,18 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         public override async Task<ModInfoModel> GetModInfoAsync(string id)
         {
             // validate ID format
-            if (!uint.TryParse(id, out uint _))
+            if (!uint.TryParse(id, out uint realID))
                 return new ModInfoModel($"The value '{id}' isn't a valid Chucklefish mod ID, must be an integer ID.");
 
             // fetch info
             try
             {
-                // fetch HTML
-                string html;
-                try
-                {
-                    html = await this.Client
-                        .GetAsync(string.Format(this.ModPageUrlFormat, id))
-                        .AsString();
-                }
-                catch (ApiException ex) when (ex.Status == HttpStatusCode.NotFound)
-                {
+                var mod = await this.Client.GetModAsync(realID);
+                if (mod == null)
                     return new ModInfoModel("Found no mod with this ID.");
-                }
-
-                // parse HTML
-                var doc = new HtmlDocument();
-                doc.LoadHtml(html);
-
-                // extract mod info
-                string url = new UriBuilder(new Uri(this.BaseUrl)) { Path = string.Format(this.ModPageUrlFormat, id) }.Uri.ToString();
-                string name = doc.DocumentNode.SelectSingleNode("//meta[@name='twitter:title']").Attributes["content"].Value;
-                if (name.StartsWith("[SMAPI] "))
-                    name = name.Substring("[SMAPI] ".Length);
-                string version = doc.DocumentNode.SelectSingleNode("//h1/span").InnerText;
 
                 // create model
-                return new ModInfoModel(name, this.NormaliseVersion(version), url);
+                return new ModInfoModel(mod.Name, this.NormaliseVersion(mod.Version), mod.Url);
             }
             catch (Exception ex)
             {
diff --git a/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs
index 9d43adf0..7bad6127 100644
--- a/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs
+++ b/src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs
@@ -1,9 +1,7 @@
 using System;
-using System.Net;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Pathoschild.Http.Client;
 using StardewModdingAPI.Common.Models;
+using StardewModdingAPI.Web.Framework.Clients.GitHub;
 
 namespace StardewModdingAPI.Web.Framework.ModRepositories
 {
@@ -13,11 +11,8 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         /*********
         ** Properties
         *********/
-        /// <summary>The URL for a Nexus Mods API query excluding the base URL, where {0} is the mod ID.</summary>
-        private readonly string ReleaseUrlFormat;
-
-        /// <summary>The underlying HTTP client.</summary>
-        private readonly IClient Client;
+        /// <summary>The underlying GitHub API client.</summary>
+        private readonly IGitHubClient Client;
 
 
         /*********
@@ -25,22 +20,11 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="vendorKey">The unique key for this vendor.</param>
-        /// <param name="baseUrl">The base URL for the Nexus Mods API.</param>
-        /// <param name="releaseUrlFormat">The URL for a Nexus Mods API query excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
-        /// <param name="userAgent">The user agent for the API client.</param>
-        /// <param name="acceptHeader">The Accept header value expected by the GitHub API.</param>
-        /// <param name="username">The username with which to authenticate to the GitHub API.</param>
-        /// <param name="password">The password with which to authenticate to the GitHub API.</param>
-        public GitHubRepository(string vendorKey, string baseUrl, string releaseUrlFormat, string userAgent, string acceptHeader, string username, string password)
+        /// <param name="client">The underlying GitHub API client.</param>
+        public GitHubRepository(string vendorKey, IGitHubClient client)
             : base(vendorKey)
         {
-            this.ReleaseUrlFormat = releaseUrlFormat;
-
-            this.Client = new FluentClient(baseUrl)
-                .SetUserAgent(userAgent)
-                .AddDefault(req => req.WithHeader("Accept", acceptHeader));
-            if (!string.IsNullOrWhiteSpace(username))
-                this.Client = this.Client.SetBasicAuthentication(username, password);
+            this.Client = client;
         }
 
         /// <summary>Get metadata about a mod in the repository.</summary>
@@ -54,14 +38,10 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
             // fetch info
             try
             {
-                GitRelease release = await this.Client
-                    .GetAsync(string.Format(this.ReleaseUrlFormat, id))
-                    .As<GitRelease>();
-                return new ModInfoModel(id, this.NormaliseVersion(release.Tag), $"https://github.com/{id}/releases");
-            }
-            catch (ApiException ex) when (ex.Status == HttpStatusCode.NotFound)
-            {
-                return new ModInfoModel("Found no mod with this ID.");
+                GitRelease release = await this.Client.GetLatestReleaseAsync(id);
+                return release != null
+                    ? new ModInfoModel(id, this.NormaliseVersion(release.Tag), $"https://github.com/{id}/releases")
+                    : new ModInfoModel("Found no mod with this ID.");
             }
             catch (Exception ex)
             {
@@ -74,24 +54,5 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         {
             this.Client.Dispose();
         }
-
-
-        /*********
-        ** Private models
-        *********/
-        /// <summary>Metadata about a GitHub release tag.</summary>
-        private class GitRelease
-        {
-            /*********
-            ** Accessors
-            *********/
-            /// <summary>The display name.</summary>
-            [JsonProperty("name")]
-            public string Name { get; set; }
-
-            /// <summary>The semantic version string.</summary>
-            [JsonProperty("tag_name")]
-            public string Tag { get; set; }
-        }
     }
 }
diff --git a/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
index 8a4bb0d8..cfa757ab 100644
--- a/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
+++ b/src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Pathoschild.Http.Client;
 using StardewModdingAPI.Common.Models;
+using StardewModdingAPI.Web.Framework.Clients.Nexus;
 
 namespace StardewModdingAPI.Web.Framework.ModRepositories
 {
@@ -12,11 +11,8 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         /*********
         ** Properties
         *********/
-        /// <summary>The URL for a Nexus Mods API query excluding the base URL, where {0} is the mod ID.</summary>
-        private readonly string ModUrlFormat;
-
-        /// <summary>The underlying HTTP client.</summary>
-        private readonly IClient Client;
+        /// <summary>The underlying Nexus Mods API client.</summary>
+        private readonly INexusClient Client;
 
 
         /*********
@@ -24,14 +20,11 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="vendorKey">The unique key for this vendor.</param>
-        /// <param name="userAgent">The user agent for the Nexus Mods API client.</param>
-        /// <param name="baseUrl">The base URL for the Nexus Mods API.</param>
-        /// <param name="modUrlFormat">The URL for a Nexus Mods API query excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
-        public NexusRepository(string vendorKey, string userAgent, string baseUrl, string modUrlFormat)
+        /// <param name="client">The underlying Nexus Mods API client.</param>
+        public NexusRepository(string vendorKey, INexusClient client)
             : base(vendorKey)
         {
-            this.ModUrlFormat = modUrlFormat;
-            this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
+            this.Client = client;
         }
 
         /// <summary>Get metadata about a mod in the repository.</summary>
@@ -39,18 +32,15 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         public override async Task<ModInfoModel> GetModInfoAsync(string id)
         {
             // validate ID format
-            if (!uint.TryParse(id, out uint _))
+            if (!uint.TryParse(id, out uint nexusID))
                 return new ModInfoModel($"The value '{id}' isn't a valid Nexus mod ID, must be an integer ID.");
 
             // fetch info
             try
             {
-                NexusResponseModel response = await this.Client
-                    .GetAsync(string.Format(this.ModUrlFormat, id))
-                    .As<NexusResponseModel>();
-
-                return response != null
-                    ? new ModInfoModel(response.Name, this.NormaliseVersion(response.Version), response.Url)
+                NexusMod mod = await this.Client.GetModAsync(nexusID);
+                return mod != null
+                    ? new ModInfoModel(mod.Name, this.NormaliseVersion(mod.Version), mod.Url)
                     : new ModInfoModel("Found no mod with this ID.");
             }
             catch (Exception ex)
@@ -64,26 +54,5 @@ namespace StardewModdingAPI.Web.Framework.ModRepositories
         {
             this.Client.Dispose();
         }
-
-
-        /*********
-        ** Private models
-        *********/
-        /// <summary>A mod metadata response from Nexus Mods.</summary>
-        private class NexusResponseModel
-        {
-            /*********
-            ** Accessors
-            *********/
-            /// <summary>The mod name.</summary>
-            public string Name { get; set; }
-
-            /// <summary>The mod's semantic version number.</summary>
-            public string Version { get; set; }
-
-            /// <summary>The mod's web URL.</summary>
-            [JsonProperty("mod_page_uri")]
-            public string Url { get; set; }
-        }
     }
 }