fix: There, now we handle if the API client dies while trying to find…

… a game/project
CurseForgeCommunity · Feb 2, 2024 · 04911e3 · 04911e3
1 parent 0edb3ef
commit 04911e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/CFDiscordBot/Commands/GameLookup.cs b/CFDiscordBot/Commands/GameLookup.cs
@@ -11,7 +11,7 @@ public async Task GameIdAsync(
             int gameId
         )
         {
-            CurseForge.APIClient.Models.Games.Game gameInfo = null;
+            CurseForge.APIClient.Models.Games.Game? gameInfo = null;
             try
             {
                 var game = await apiClient.GetGameAsync(gameId);

diff --git a/CFDiscordBot/Commands/ProjectLookup.cs b/CFDiscordBot/Commands/ProjectLookup.cs
@@ -13,9 +13,18 @@ public async Task ProjectIdAsync(
             int projectId
         )
         {
-            var project = await apiClient.GetModAsync(projectId);
+            CurseForge.APIClient.Models.Mods.Mod? mod = null;
+            try
+            {
+                var project = await apiClient.GetModAsync(projectId);
+                mod = project.Data;
+            }
+            catch
+            {
+                // Empty because, ugh
+            }
 
-            if (project is null)
+            if (mod is null)
             {
                 await RespondAsync($"Project with id {projectId} was not found.", ephemeral: true);
 
@@ -24,8 +33,6 @@ int projectId
                 return;
             }
 
-            var mod = project.Data;
-
             //var modFiles = new List<CurseForge.APIClient.Models.Files.File>();
 
             //var files = await apiClient.GetModFilesAsync(projectId, pageSize: 50);
@@ -87,7 +94,7 @@ int projectId
             {
                 Title = "Project information",
                 Color = Color.DarkOrange,
-                Fields = new List<EmbedFieldBuilder>()
+                Fields = []
             };
 
             if (Uri.TryCreate(mod.Logo?.ThumbnailUrl, UriKind.Absolute, out var logoUri))
@@ -102,13 +109,13 @@ int projectId
             var categories = string.Join(", ", mod.Categories.Select(c => $"[{c.Name}]({c.Url})"));
 
             var fields = new List<EmbedFieldBuilder> {
-                new EmbedFieldBuilder { Name = "Author", Value = string.Join(", ", mod.Authors.Select(c => $"[{c.Name}]({c.Url})")), IsInline = true },
-                new EmbedFieldBuilder { Name = "Status", Value = mod.Status.ToString(), IsInline = true },
-                new EmbedFieldBuilder { Name = "Created", Value = $"<t:{mod.DateCreated.ToUnixTimeSeconds()}:F>", IsInline = true },
-                new EmbedFieldBuilder { Name = "Modified", Value = $"<t:{mod.DateModified.ToUnixTimeSeconds()}:F>", IsInline = true },
-                new EmbedFieldBuilder { Name = "Released", Value = $"<t:{mod.DateReleased.ToUnixTimeSeconds()}:F>", IsInline = true },
-                new EmbedFieldBuilder { Name = "Downloads", Value = mod.DownloadCount.ToString("n0"), IsInline = true },
-                new EmbedFieldBuilder { Name = "Mod Distribution", Value = mod.AllowModDistribution ?? true ? "Allowed" : "Not allowed", IsInline = true },
+                new() { Name = "Author", Value = string.Join(", ", mod.Authors.Select(c => $"[{c.Name}]({c.Url})")), IsInline = true },
+                new() { Name = "Status", Value = mod.Status.ToString(), IsInline = true },
+                new() { Name = "Created", Value = $"<t:{mod.DateCreated.ToUnixTimeSeconds()}:F>", IsInline = true },
+                new() { Name = "Modified", Value = $"<t:{mod.DateModified.ToUnixTimeSeconds()}:F>", IsInline = true },
+                new() { Name = "Released", Value = $"<t:{mod.DateReleased.ToUnixTimeSeconds()}:F>", IsInline = true },
+                new() { Name = "Downloads", Value = mod.DownloadCount.ToString("n0"), IsInline = true },
+                new() { Name = "Mod Distribution", Value = mod.AllowModDistribution ?? true ? "Allowed" : "Not allowed", IsInline = true },
             };
 
             if (!string.IsNullOrWhiteSpace(categories))