refactor update check API

This simplifies the logic for individual clients, centralises common logic, and prepares for upcoming features.

2 files changed, 9 insertions, 9 deletions

diff --git a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
index 004202f9..0d912c7b 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/IModCacheRepository.cs
@@ -1,6 +1,6 @@
 using System;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.ModRepositories;
+using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
@@ -15,13 +15,13 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The fetched mod.</param>
         /// <param name="markRequested">Whether to update the mod's 'last requested' date.</param>
-        bool TryGetMod(ModRepositoryKey site, string id, out Cached<ModInfoModel> mod, bool markRequested = true);
+        bool TryGetMod(ModSiteKey site, string id, out Cached<IModPage> mod, bool markRequested = true);
 
         /// <summary>Save data fetched for a mod.</summary>
         /// <param name="site">The mod site on which the mod is found.</param>
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The mod data.</param>
-        void SaveMod(ModRepositoryKey site, string id, ModInfoModel mod);
+        void SaveMod(ModSiteKey site, string id, IModPage mod);
 
         /// <summary>Delete data for mods which haven't been requested within a given time limit.</summary>
         /// <param name="age">The minimum age for which to remove mods.</param>
diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
index 62461116..6b0ec1ec 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheMemoryRepository.cs
@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using StardewModdingAPI.Toolkit.Framework.UpdateData;
-using StardewModdingAPI.Web.Framework.ModRepositories;
+using StardewModdingAPI.Web.Framework.Clients;
 
 namespace StardewModdingAPI.Web.Framework.Caching.Mods
 {
@@ -13,7 +13,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         ** Fields
         *********/
         /// <summary>The cached mod data indexed by <c>{site key}:{ID}</c>.</summary>
-        private readonly IDictionary<string, Cached<ModInfoModel>> Mods = new Dictionary<string, Cached<ModInfoModel>>(StringComparer.InvariantCultureIgnoreCase);
+        private readonly IDictionary<string, Cached<IModPage>> Mods = new Dictionary<string, Cached<IModPage>>(StringComparer.InvariantCultureIgnoreCase);
 
 
         /*********
@@ -24,7 +24,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The fetched mod.</param>
         /// <param name="markRequested">Whether to update the mod's 'last requested' date.</param>
-        public bool TryGetMod(ModRepositoryKey site, string id, out Cached<ModInfoModel> mod, bool markRequested = true)
+        public bool TryGetMod(ModSiteKey site, string id, out Cached<IModPage> mod, bool markRequested = true)
         {
             // get mod
             if (!this.Mods.TryGetValue(this.GetKey(site, id), out var cachedMod))
@@ -45,10 +45,10 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <param name="site">The mod site on which the mod is found.</param>
         /// <param name="id">The mod's unique ID within the <paramref name="site"/>.</param>
         /// <param name="mod">The mod data.</param>
-        public void SaveMod(ModRepositoryKey site, string id, ModInfoModel mod)
+        public void SaveMod(ModSiteKey site, string id, IModPage mod)
         {
             string key = this.GetKey(site, id);
-            this.Mods[key] = new Cached<ModInfoModel>(mod);
+            this.Mods[key] = new Cached<IModPage>(mod);
         }
 
         /// <summary>Delete data for mods which haven't been requested within a given time limit.</summary>
@@ -73,7 +73,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         /// <summary>Get a cache key.</summary>
         /// <param name="site">The mod site.</param>
         /// <param name="id">The mod ID.</param>
-        private string GetKey(ModRepositoryKey site, string id)
+        private string GetKey(ModSiteKey site, string id)
         {
             return $"{site}:{id.Trim()}".ToLower();
         }