fix inconsistent mod/user ID types in mod data

Pathoschild · Pathoschild · commit 13818abc3d84 · 2026-06-10T22:17:08.000-04:00
This avoids needing to cast values between models (e.g. between the compatibility list and open mod dataset).
diff --git a/src/SMAPI.Toolkit/Framework/Clients/CompatibilityRepo/ModCompatibilityEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/CompatibilityRepo/ModCompatibilityEntry.cs
@@ -19,16 +19,16 @@ public class ModCompatibilityEntry
     public string[] Author { get; }
 
     /// <summary>The mod ID on Nexus.</summary>
-    public int? NexusID { get; }
+    public long? NexusID { get; }
 
     /// <summary>The mod ID in the Chucklefish mod repo.</summary>
-    public int? ChucklefishID { get; }
+    public long? ChucklefishID { get; }
 
     /// <summary>The mod ID in the CurseForge mod repo.</summary>
-    public int? CurseForgeID { get; }
+    public long? CurseForgeID { get; }
 
     /// <summary>The mod ID in the ModDrop mod repo.</summary>
-    public int? ModDropID { get; }
+    public long? ModDropID { get; }
 
     /// <summary>The GitHub repository in the form 'owner/repo'.</summary>
     public string? GitHubRepo { get; }
@@ -82,7 +82,7 @@ public class ModCompatibilityEntry
     /// <param name="devNote"><inheritdoc cref="DevNote" path="/summary"/></param>
     /// <param name="overrides"><inheritdoc cref="Overrides" path="/summary"/></param>
     /// <param name="anchor"><inheritdoc cref="Anchor" path="/summary"/></param>
-    public ModCompatibilityEntry(string[] id, string[] name, string[] author, int? nexusId, int? chucklefishId, int? curseForgeId, int? modDropId, string? githubRepo, string? customSourceUrl, string? customUrl, string? contentPackFor, ModCompatibilityInfo compatibility, string[] warnings, string[]? htmlWarnings, string? devNote, ModDataOverrideEntry? overrides, string? anchor)
+    public ModCompatibilityEntry(string[] id, string[] name, string[] author, long? nexusId, long? chucklefishId, long? curseForgeId, long? modDropId, string? githubRepo, string? customSourceUrl, string? customUrl, string? contentPackFor, ModCompatibilityInfo compatibility, string[] warnings, string[]? htmlWarnings, string? devNote, ModDataOverrideEntry? overrides, string? anchor)
     {
         this.ID = id;
         this.Name = name;
@@ -145,7 +145,7 @@ public IEnumerable<KeyValuePair<ModSiteKey, string>> GetModPageUrls()
     /// <summary>Get whether this compatibility entry refers to the given mod site page ID.</summary>
     /// <param name="site">The mod site.</param>
     /// <param name="id">The mod page ID.</param>
-    public bool HasSiteId(ModSiteKey site, int id)
+    public bool HasSiteId(ModSiteKey site, long id)
     {
         return site switch
         {
diff --git a/src/SMAPI.Toolkit/Framework/Clients/CompatibilityRepo/RawDataModels/RawModEntry.cs b/src/SMAPI.Toolkit/Framework/Clients/CompatibilityRepo/RawDataModels/RawModEntry.cs
@@ -21,7 +21,7 @@ public class RawModEntry
     public string? Id { get; set; }
 
     /// <summary>The mod's unique ID on Nexus, or null if it has none. This is the number in the mod page's URL.</summary>
-    public int? Nexus { get; set; }
+    public long? Nexus { get; set; }
 
     /// <summary>The mod's GitHub repository in the form owner/repo, or null if it has none.</summary>
     public string? GitHub { get; set; }
@@ -30,13 +30,13 @@ public class RawModEntry
     ** Secondary fields
     ****/
     /// <summary>The mod's unique ID in the legacy Chucklefish mod repository (if any). This is the value shown in the mod page's URL.</summary>
-    public int? Chucklefish { get; set; }
+    public long? Chucklefish { get; set; }
 
     /// <summary>The mod's unique ID on CurseForge (if any). This is the value shown on the mod page next to "Project ID".</summary>
-    public int? Curse { get; set; }
+    public long? Curse { get; set; }
 
     /// <summary>The mod's unique ID on ModDrop (if any). This is the value shown in the mod page's URL.</summary>
-    public int? ModDrop { get; set; }
+    public long? ModDrop { get; set; }
 
     /// <summary>The arbitrary mod URL, if the mod isn't on a mod site supported by more specific fields like `nexus`. This should be avoided if possible, since this makes cross-referencing much more difficult.</summary>
     public string? Url { get; set; }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/CurseForgeExport/ResponseModels/CurseForgeAuthorExport.cs b/src/SMAPI.Toolkit/Framework/Clients/CurseForgeExport/ResponseModels/CurseForgeAuthorExport.cs
@@ -4,7 +4,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.CurseForgeExport.ResponseM
 public class CurseForgeAuthorExport
 {
     /// <summary>The author's user ID.</summary>
-    public uint Id { get; set; }
+    public long Id { get; set; }
 
     /// <summary>The author's display name.</summary>
     public string? Name { get; set; }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/CurseForgeExport/ResponseModels/CurseForgeFullExport.cs b/src/SMAPI.Toolkit/Framework/Clients/CurseForgeExport/ResponseModels/CurseForgeFullExport.cs
@@ -7,7 +7,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.CurseForgeExport.ResponseM
 public class CurseForgeFullExport
 {
     /// <summary>The mod data indexed by public mod ID.</summary>
-    public Dictionary<uint, CurseForgeModExport> Mods { get; set; } = new();
+    public Dictionary<long, CurseForgeModExport> Mods { get; set; } = new();
 
     /// <summary>The HTTP cache headers set by a remote server.</summary>
     [JsonIgnore]
diff --git a/src/SMAPI.Toolkit/Framework/Clients/ModDropExport/ResponseModels/ModDropFileExport.cs b/src/SMAPI.Toolkit/Framework/Clients/ModDropExport/ResponseModels/ModDropFileExport.cs
@@ -8,7 +8,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.ModDropExport.ResponseMode
 public class ModDropFileExport
 {
     /// <summary>The file identifier.</summary>
-    public uint Id { get; set; }
+    public long Id { get; set; }
 
     /// <summary>The file's display title.</summary>
     [JsonProperty("title")]
diff --git a/src/SMAPI.Toolkit/Framework/Clients/ModDropExport/ResponseModels/ModDropModExport.cs b/src/SMAPI.Toolkit/Framework/Clients/ModDropExport/ResponseModels/ModDropModExport.cs
@@ -8,7 +8,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.ModDropExport.ResponseMode
 public class ModDropModExport
 {
     /// <summary>The mod ID.</summary>
-    public uint Id { get; set; }
+    public long Id { get; set; }
 
     /// <summary>The mod page title.</summary>
     public string? Title { get; set; }
diff --git a/src/SMAPI.Toolkit/Framework/Clients/NexusExport/ResponseModels/NexusFullExport.cs b/src/SMAPI.Toolkit/Framework/Clients/NexusExport/ResponseModels/NexusFullExport.cs
@@ -7,7 +7,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.NexusExport.ResponseModels
 public class NexusFullExport
 {
     /// <summary>The mod data indexed by public mod ID.</summary>
-    public Dictionary<uint, NexusModExport> Data { get; set; } = new();
+    public Dictionary<long, NexusModExport> Data { get; set; } = new();
 
     /// <summary>The HTTP cache headers set by a remote server.</summary>
     [JsonIgnore]
diff --git a/src/SMAPI.Toolkit/Framework/Clients/NexusExport/ResponseModels/NexusModExport.cs b/src/SMAPI.Toolkit/Framework/Clients/NexusExport/ResponseModels/NexusModExport.cs
@@ -21,7 +21,7 @@ public class NexusModExport
 
     /// <summary>The ID for the user who uploaded the mod.</summary>
     [JsonProperty("uploader_id")]
-    public int UploaderId { get; set; }
+    public long UploaderId { get; set; }
 
     /// <summary>The mod's semantic version.</summary>
     public string? Version { get; set; }
@@ -47,7 +47,7 @@ public class NexusModExport
     public string Description { get; set; }
 
     /// <summary>The files uploaded for the mod.</summary>
-    public Dictionary<uint, NexusFileExport> Files { get; set; } = new();
+    public Dictionary<long, NexusFileExport> Files { get; set; } = new();
 
     /// <summary>The extra fields returned by the export API, if any.</summary>
     [JsonExtensionData]
diff --git a/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs b/src/SMAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs
@@ -23,16 +23,16 @@ public class ModExtendedMetadataModel
     public string? Name { get; set; }
 
     /// <summary>The mod ID on Nexus.</summary>
-    public int? NexusID { get; set; }
+    public long? NexusID { get; set; }
 
     /// <summary>The mod ID in the Chucklefish mod repo.</summary>
-    public int? ChucklefishID { get; set; }
+    public long? ChucklefishID { get; set; }
 
     /// <summary>The mod ID in the CurseForge mod repo.</summary>
-    public int? CurseForgeID { get; set; }
+    public long? CurseForgeID { get; set; }
 
     /// <summary>The mod ID in the ModDrop mod repo.</summary>
-    public int? ModDropID { get; set; }
+    public long? ModDropID { get; set; }
 
     /// <summary>The GitHub repository in the form 'owner/repo'.</summary>
     public string? GitHubRepo { get; set; }
diff --git a/src/SMAPI.Web/Framework/Caching/CurseForgeExport/CurseForgeExportCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/CurseForgeExport/CurseForgeExportCacheMemoryRepository.cs
@@ -45,7 +45,7 @@ public override void SetCacheHeaders(ApiCacheHeaders headers)
     }
 
     /// <inheritdoc />
-    public bool TryGetMod(uint id, [NotNullWhen(true)] out CurseForgeModExport? mod)
+    public bool TryGetMod(long id, [NotNullWhen(true)] out CurseForgeModExport? mod)
     {
         var data = this.Data?.Mods;
 
diff --git a/src/SMAPI.Web/Framework/Caching/CurseForgeExport/ICurseForgeExportCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/CurseForgeExport/ICurseForgeExportCacheRepository.cs
@@ -12,7 +12,7 @@ internal interface ICurseForgeExportCacheRepository : IExportCacheRepository
     /// <summary>Get the cached data for a mod, if it exists in the export.</summary>
     /// <param name="id">The CurseForge mod ID.</param>
     /// <param name="mod">The fetched metadata.</param>
-    bool TryGetMod(uint id, [NotNullWhen(true)] out CurseForgeModExport? mod);
+    bool TryGetMod(long id, [NotNullWhen(true)] out CurseForgeModExport? mod);
 
     /// <summary>Set the cached data to use.</summary>
     /// <param name="export">The export received from the CurseForge Mods API, or <c>null</c> to remove it.</param>
diff --git a/src/SMAPI.Web/Framework/Caching/NexusExport/INexusExportCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/NexusExport/INexusExportCacheRepository.cs
@@ -12,7 +12,7 @@ internal interface INexusExportCacheRepository : IExportCacheRepository
     /// <summary>Get the cached data for a mod, if it exists in the export.</summary>
     /// <param name="id">The Nexus mod ID.</param>
     /// <param name="mod">The fetched metadata.</param>
-    bool TryGetMod(uint id, [NotNullWhen(true)] out NexusModExport? mod);
+    bool TryGetMod(long id, [NotNullWhen(true)] out NexusModExport? mod);
 
     /// <summary>Set the cached data to use.</summary>
     /// <param name="export">The export received from the Nexus Mods API, or <c>null</c> to remove it.</param>
diff --git a/src/SMAPI.Web/Framework/Caching/NexusExport/NexusExportCacheMemoryRepository.cs b/src/SMAPI.Web/Framework/Caching/NexusExport/NexusExportCacheMemoryRepository.cs
@@ -45,7 +45,7 @@ public override void SetCacheHeaders(ApiCacheHeaders headers)
     }
 
     /// <inheritdoc />
-    public bool TryGetMod(uint id, [NotNullWhen(true)] out NexusModExport? mod)
+    public bool TryGetMod(long id, [NotNullWhen(true)] out NexusModExport? mod)
     {
         var data = this.Data?.Data;
 
diff --git a/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs b/src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs
@@ -47,7 +47,7 @@ public ChucklefishClient(string userAgent, string baseUrl, string modPageUrlForm
         IModPage page = new GenericModPage(this.SiteKey, id);
 
         // get mod ID
-        if (!uint.TryParse(id, out uint parsedId))
+        if (!long.TryParse(id, out long parsedId))
             return page.SetError(RemoteModStatus.DoesNotExist, $"The value '{id}' isn't a valid Chucklefish mod ID, must be an integer ID.");
 
         // fetch HTML
@@ -88,7 +88,7 @@ public void Dispose()
     *********/
     /// <summary>Get the full mod page URL for a given ID.</summary>
     /// <param name="id">The mod ID.</param>
-    private string GetModUrl(uint id)
+    private string GetModUrl(long id)
     {
         UriBuilder builder = new(this.Client.BaseClient.BaseAddress!);
         builder.Path += string.Format(this.ModPageUrlFormat, id);
diff --git a/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs b/src/SMAPI.Web/Framework/Clients/CurseForge/CurseForgeClient.cs
@@ -59,7 +59,7 @@ public CurseForgeClient(string userAgent, string apiUrl, string apiKey, string w
     public async Task<IModPage?> GetModData(string id)
     {
         // get ID
-        if (!uint.TryParse(id, out uint parsedId))
+        if (!long.TryParse(id, out long parsedId))
             return this.InitModPage(id).SetError(RemoteModStatus.DoesNotExist, $"The value '{id}' isn't a valid CurseForge mod ID, must be an integer ID.");
 
         // To minimize time users spend waiting for the update check result, we fetch the mod
@@ -94,7 +94,7 @@ public void Dispose()
     *********/
     /// <summary>Initialize an empty mod page model.</summary>
     /// <param name="id">The CurseForge mod ID.</param>
-    private IModPage InitModPage(uint id)
+    private IModPage InitModPage(long id)
     {
         return new GenericModPage(this.SiteKey, id.ToString());
     }
@@ -109,7 +109,7 @@ private IModPage InitModPage(string id)
     /// <summary>Get metadata about a mod by searching the CurseForge export API data.</summary>
     /// <param name="id">The CurseForge mod ID.</param>
     /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
-    private IModPage? GetModFromExportData(uint id)
+    private IModPage? GetModFromExportData(long id)
     {
         // skip if no data available
         if (!this.ExportCache.IsLoaded || !this.ExportCache.TryGetMod(id, out CurseForgeModExport? data))
@@ -147,7 +147,7 @@ private IModPage InitModPage(string id)
     /// <summary>Get metadata about a mod from the CurseForge API.</summary>
     /// <param name="id">The CurseForge mod ID.</param>
     /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
-    private async Task<IModPage?> GetModFromApiAsync(uint id)
+    private async Task<IModPage?> GetModFromApiAsync(long id)
     {
         // get raw data
         ModModel? mod;
@@ -208,7 +208,7 @@ private IModPage InitModPage(string id)
 
     /// <summary>Get the full mod page URL for a given ID.</summary>
     /// <param name="id">The mod ID.</param>
-    private string GetModUrl(uint id)
+    private string GetModUrl(long id)
     {
         return string.Format(this.WebModUrl, id);
     }
diff --git a/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs b/src/SMAPI.Web/Framework/Clients/Nexus/NexusClient.cs
@@ -70,7 +70,7 @@ public NexusClient(string webUserAgent, string webBaseUrl, string webModUrlForma
     {
         IModPage page = new GenericModPage(this.SiteKey, id);
 
-        if (!uint.TryParse(id, out uint parsedId))
+        if (!long.TryParse(id, out long parsedId))
             return page.SetError(RemoteModStatus.DoesNotExist, $"The value '{id}' isn't a valid Nexus mod ID, must be an integer ID.");
 
         // Nexus has strict rate limits meant for a user's mod manager, which are too low to
@@ -126,7 +126,7 @@ public void Dispose()
     /// <summary>Get metadata about a mod by searching the Nexus export API data.</summary>
     /// <param name="id">The Nexus mod ID.</param>
     /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
-    private Task<NexusMod?> GetModFromExportDataAsync(uint id)
+    private Task<NexusMod?> GetModFromExportDataAsync(long id)
     {
         static Task<NexusMod?> ModResult(NexusMod mod) => Task.FromResult<NexusMod?>(mod);
         static Task<NexusMod?> StatusResult(NexusModStatus status) => Task.FromResult<NexusMod?>(new NexusMod(status, status.ToString()));
@@ -143,7 +143,7 @@ public void Dispose()
 
         // get downloads
         var downloads = new List<IModDownload>();
-        foreach ((uint fileId, NexusFileExport file) in data.Files)
+        foreach ((long fileId, NexusFileExport file) in data.Files)
         {
             if ((FileCategory)file.CategoryId is FileCategory.Main or FileCategory.Optional)
             {
@@ -167,7 +167,7 @@ public void Dispose()
     /// <summary>Get metadata about a mod by scraping the Nexus website.</summary>
     /// <param name="id">The Nexus mod ID.</param>
     /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
-    private async Task<NexusMod?> GetModFromWebsiteAsync(uint id)
+    private async Task<NexusMod?> GetModFromWebsiteAsync(long id)
     {
         // fetch HTML
         string html;
@@ -244,7 +244,7 @@ public void Dispose()
     /// <summary>Get metadata about a mod from the Nexus API.</summary>
     /// <param name="id">The Nexus mod ID.</param>
     /// <returns>Returns the mod info if found, else <c>null</c>.</returns>
-    private async Task<NexusMod> GetModFromApiAsync(uint id)
+    private async Task<NexusMod> GetModFromApiAsync(long id)
     {
         // fetch mod
         Mod mod = await this.ApiClient.Mods.GetMod("stardewvalley", (int)id);
@@ -263,7 +263,7 @@ private async Task<NexusMod> GetModFromApiAsync(uint id)
 
     /// <summary>Get the full mod page URL for a given ID.</summary>
     /// <param name="id">The mod ID.</param>
-    private string GetModUrl(uint id)
+    private string GetModUrl(long id)
     {
         UriBuilder builder = new(this.WebClient.BaseClient.BaseAddress!);
         builder.Path += string.Format(this.WebModUrlFormat, id);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.CurseForgeExport.ResponseM`
`4`	`4`	`public class CurseForgeAuthorExport`
`5`	`5`	`{`
`6`	`6`	`/// <summary>The author's user ID.</summary>`
`7`		`- public uint Id { get; set; }`
	`7`	`+ public long Id { get; set; }`
`8`	`8`
`9`	`9`	`/// <summary>The author's display name.</summary>`
`10`	`10`	`public string? Name { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.CurseForgeExport.ResponseM`
`7`	`7`	`public class CurseForgeFullExport`
`8`	`8`	`{`
`9`	`9`	`/// <summary>The mod data indexed by public mod ID.</summary>`
`10`		`- public Dictionary<uint, CurseForgeModExport> Mods { get; set; } = new();`
	`10`	`+ public Dictionary<long, CurseForgeModExport> Mods { get; set; } = new();`
`11`	`11`
`12`	`12`	`/// <summary>The HTTP cache headers set by a remote server.</summary>`
`13`	`13`	`[JsonIgnore]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.ModDropExport.ResponseMode`
`8`	`8`	`public class ModDropFileExport`
`9`	`9`	`{`
`10`	`10`	`/// <summary>The file identifier.</summary>`
`11`		`- public uint Id { get; set; }`
	`11`	`+ public long Id { get; set; }`
`12`	`12`
`13`	`13`	`/// <summary>The file's display title.</summary>`
`14`	`14`	`[JsonProperty("title")]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.ModDropExport.ResponseMode`
`8`	`8`	`public class ModDropModExport`
`9`	`9`	`{`
`10`	`10`	`/// <summary>The mod ID.</summary>`
`11`		`- public uint Id { get; set; }`
	`11`	`+ public long Id { get; set; }`
`12`	`12`
`13`	`13`	`/// <summary>The mod page title.</summary>`
`14`	`14`	`public string? Title { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace StardewModdingAPI.Toolkit.Framework.Clients.NexusExport.ResponseModels`
`7`	`7`	`public class NexusFullExport`
`8`	`8`	`{`
`9`	`9`	`/// <summary>The mod data indexed by public mod ID.</summary>`
`10`		`- public Dictionary<uint, NexusModExport> Data { get; set; } = new();`
	`10`	`+ public Dictionary<long, NexusModExport> Data { get; set; } = new();`
`11`	`11`
`12`	`12`	`/// <summary>The HTTP cache headers set by a remote server.</summary>`
`13`	`13`	`[JsonIgnore]`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public override void SetCacheHeaders(ApiCacheHeaders headers)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/// <inheritdoc />`
`48`		`- public bool TryGetMod(uint id, [NotNullWhen(true)] out CurseForgeModExport? mod)`
	`48`	`+ public bool TryGetMod(long id, [NotNullWhen(true)] out CurseForgeModExport? mod)`
`49`	`49`	`{`
`50`	`50`	`var data = this.Data?.Mods;`
`51`	`51`