From 0a71285c631a6ef52ea381c35224f353a618e3fa Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 4 Mar 2018 21:05:50 -0500
Subject: fix broken Nexus mod URLs

---
 .../Clients/Chucklefish/ChucklefishClient.cs          | 19 ++++++++++++++-----
 .../Framework/Clients/Nexus/NexusWebScrapeClient.cs   | 15 ++++++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
index 6772672c..029553ce 100644
--- a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -12,9 +12,6 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         /*********
         ** 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;
 
@@ -31,7 +28,6 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         /// <param name="modPageUrlFormat">The URL for a mod page excluding the <paramref name="baseUrl"/>, where {0} is the mod ID.</param>
         public ChucklefishClient(string userAgent, string baseUrl, string modPageUrlFormat)
         {
-            this.BaseUrl = baseUrl;
             this.ModPageUrlFormat = modPageUrlFormat;
             this.Client = new FluentClient(baseUrl).SetUserAgent(userAgent);
         }
@@ -59,7 +55,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
             doc.LoadHtml(html);
 
             // extract mod info
-            string url = new UriBuilder(new Uri(this.BaseUrl)) { Path = string.Format(this.ModPageUrlFormat, id) }.Uri.ToString();
+            string url = this.GetModUrl(id);
             string name = doc.DocumentNode.SelectSingleNode("//meta[@name='twitter:title']").Attributes["content"].Value;
             if (name.StartsWith("[SMAPI] "))
                 name = name.Substring("[SMAPI] ".Length);
@@ -79,5 +75,18 @@ namespace StardewModdingAPI.Web.Framework.Clients.Chucklefish
         {
             this.Client?.Dispose();
         }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Get the full mod page URL for a given ID.</summary>
+        /// <param name="id">The mod ID.</param>
+        private string GetModUrl(uint id)
+        {
+            UriBuilder builder = new UriBuilder(this.Client.BaseClient.BaseAddress);
+            builder.Path += string.Format(this.ModPageUrlFormat, id);
+            return builder.Uri.ToString();
+        }
     }
 }
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs
index 1e941e3d..d0597965 100644
--- a/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs
+++ b/src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs
@@ -72,7 +72,7 @@ namespace StardewModdingAPI.Web.Framework.Clients.Nexus
             }
 
             // extract mod info
-            string url = new UriBuilder(this.Client.BaseClient.BaseAddress) { Path = string.Format(this.ModUrlFormat, id) }.Uri.ToString();
+            string url = this.GetModUrl(id);
             string name = doc.DocumentNode.SelectSingleNode("//h1")?.InnerText.Trim();
             string version = doc.DocumentNode.SelectSingleNode("//ul[contains(@class, 'stats')]//li[@class='stat-version']//div[@class='stat']")?.InnerText.Trim();
 
@@ -89,5 +89,18 @@ namespace StardewModdingAPI.Web.Framework.Clients.Nexus
         {
             this.Client?.Dispose();
         }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Get the full mod page URL for a given ID.</summary>
+        /// <param name="id">The mod ID.</param>
+        private string GetModUrl(uint id)
+        {
+            UriBuilder builder = new UriBuilder(this.Client.BaseClient.BaseAddress);
+            builder.Path += string.Format(this.ModUrlFormat, id);
+            return builder.Uri.ToString();
+        }
     }
 }
-- 
cgit