Implement various null checks

2023-01-15 04:51:30 +01:00
parent 546eb49144
commit d2abeb35fc
3 changed files with 28 additions and 6 deletions
--- a/src/main/java/wtf/beatrice/hidekobot/commands/base/Trivia.java
+++ b/src/main/java/wtf/beatrice/hidekobot/commands/base/Trivia.java
@@ -61,9 +61,13 @@ public class Trivia

    public static MessageResponse generateMainScreen()
    {
-        // todo null checks
        JSONObject categoriesJson = Trivia.fetchJson(Trivia.getCategoriesLink());
+        if(categoriesJson == null)
+            return new MessageResponse("Error fetching trivia!", null); // todo nicer with emojis
        List<TriviaCategory> categories = Trivia.parseCategories(categoriesJson);
+        if(categories.isEmpty())
+            return new MessageResponse("Error parsing trivia categories!", null); // todo nicer with emojis
+        
        categories.sort(new TriviaCategoryComparator());

        EmbedBuilder embedBuilder = new EmbedBuilder();