Update thunderstore api json to latest

xiaoxiao921 · Oct 3, 2020 · abd5a3b · abd5a3b
1 parent 9931ad0
commit abd5a3b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CHEF/Components/Commands/Info.cs b/CHEF/Components/Commands/Info.cs
@@ -186,7 +186,9 @@ public async Task ModInfo(
             }
 
             var embedBuilder = new EmbedBuilder();
-            embedBuilder.WithColor(modInfo.IsDeprecated ? Color.Red : Color.Green);
+
+            var pinkColor = new Color(255, 20, 147);
+            embedBuilder.WithColor(modInfo.IsDeprecated ? Color.Red : modInfo.IsNsfw() ? pinkColor : Color.Green);
 
             embedBuilder.WithAuthor(modInfo.Owner);
             embedBuilder.WithTitle($"{modInfo.Name} v{modInfo.LatestPackage().VersionNumber}");
@@ -199,6 +201,8 @@ public async Task ModInfo(
                 embedBuilder.AddField("DEPRECATED", "This mod is deprecated, it may not work correctly.");
             }
 
+            embedBuilder.AddField("Categories", string.Join(", ", modInfo.Categories));
+
             embedBuilder.AddField("Rating Score", modInfo.RatingScore, true);
             embedBuilder.AddField("Total downloads", modInfo.TotalDownloads(), true);
 

diff --git a/CHEF/Components/Commands/ThunderstoreAPI.cs b/CHEF/Components/Commands/ThunderstoreAPI.cs
@@ -39,11 +39,19 @@ public class PackageV1
         [JsonProperty("is_deprecated")]
         public bool IsDeprecated { get; set; }
 
+        [JsonProperty("has_nsfw_content")]
+        public bool HasNsfwContent { get; set; }
+
+        [JsonProperty("categories")]
+        public string[] Categories { get; set; }
+
         [JsonProperty("versions")]
         public VersionV1[] Versions { get; set; }
 
         public VersionV1 LatestPackage() => Versions[0];
         public long TotalDownloads() => Versions.Sum(version => version.Downloads);
+        public bool IsNsfw() => HasNsfwContent || 
+                                Categories.Any(category => category.ToLowerInvariant().Contains("nsfw"));
     }
 
     public class VersionV1
@@ -64,7 +72,7 @@ public class VersionV1
         public string VersionNumber { get; set; }
 
         [JsonProperty("dependencies")]
-        public string[] Dependencies { get; set; }
+        public object[] Dependencies { get; set; }
 
         [JsonProperty("download_url")]
         public Uri DownloadUrl { get; set; }