Improve Null Safety, Add More Logging

Author: gmitch215

src/main/java/io/codemc/bot/commands/CmdApplication.java

@@ -30,6 +30,7 @@
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.MessageEmbed.Footer;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
 import net.dv8tion.jda.api.exceptions.ErrorHandler;
@@ -88,28 +89,36 @@ public static void handle(CodeMCBot bot, InteractionHook hook, Guild guild, long
             }
 
             MessageEmbed embed = embeds.get(0);
-            if(embed.getFooter() == null || embed.getFields().isEmpty()){
+            Footer footer = embed.getFooter();
+            if(footer == null || embed.getFields().isEmpty()){
                 CommandUtil.EmbedReply.from(hook).error("Embed does not have a footer or any Embed Fields.").send();
                 return;
             }
-            
-            String userId = embed.getFooter().getText().trim();
-            if(userId == null || userId.isEmpty()){
+
+            String footerText = footer.getText();
+            if(footerText == null || footerText.isEmpty()){
                 CommandUtil.EmbedReply.from(hook).error("Embed does not have a valid footer.").send();
                 return;
             }
-            
+
+            String userId = footerText.trim();
             String userLink = null;
             String repoLink = null;
             for(MessageEmbed.Field field : embed.getFields()){
-                if(field.getName() == null || field.getValue() == null)
+                String name = field.getName();
+                if(name == null || field.getValue() == null)
                     continue;
 
-                if(field.getName().equalsIgnoreCase("user/organisation:")){
+                if(name.equalsIgnoreCase("user/organisation:")){
                     userLink = field.getValue();
                 }else
-                if(field.getName().equalsIgnoreCase("repository:")){
+                if(name.equalsIgnoreCase("repository:")){
                     String link = field.getValue();
+                    if (link == null || link.isEmpty()) {
+                        CommandUtil.EmbedReply.from(hook).error("Repository field is empty!").send();
+                        return;
+                    }
+
                     String url = link.substring(link.indexOf("(") + 1, link.indexOf(")"));
 
                     repoLink = url.isEmpty() ? link : url;

src/main/java/io/codemc/bot/commands/CmdCodeMC.java

@@ -234,6 +234,10 @@ public void withHookReply(InteractionHook hook, SlashCommandEvent event, Guild g
 
             long id = dbUser.getDiscord();
             Member user = guild.getMemberById(id);
+            if (user == null) {
+                CommandUtil.EmbedReply.from(hook).success("Successfully removed " + username + " from the CodeMC Services!").send();
+                return;
+            }
 
             Role authorRole = guild.getRoleById(bot.getConfigHandler().getLong("author_role"));
             if (authorRole == null) {

src/main/java/io/codemc/bot/config/ConfigHandler.java

@@ -36,12 +36,14 @@ public class ConfigHandler{
 
     private final Logger logger = LoggerFactory.getLogger(ConfigHandler.class);
     private final File file = new File("./config.json");
+    private boolean loaded = false;
 
     private ConfigurationNode node = null;
 
     public ConfigHandler(){}
 
     public boolean loadConfig(){
+        if (loaded) return reloadConfig();
         logger.info("Loading config.json...");
 
         if(!file.exists()){
@@ -59,6 +61,7 @@ public boolean loadConfig(){
             }
         }
 
+        loaded = true;
         return reloadConfig();
     }
 
@@ -102,4 +105,12 @@ public List<String> getStringList(Object... path){
             return Collections.emptyList();
         }
     }
+
+    public void set(Object value, Object... path){
+        try{
+            node.node(path).set(value);
+        }catch(SerializationException ex){
+            logger.error("Unable to set value in Configuration!", ex);
+        }
+    }
 }

src/main/java/io/codemc/bot/listeners/ButtonListener.java

@@ -32,12 +32,15 @@
 import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
 import net.dv8tion.jda.api.interactions.modals.Modal;
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class ButtonListener extends ListenerAdapter{
 
     private final CodeMCBot bot;
+    private final Logger logger = LoggerFactory.getLogger(ButtonListener.class);
 
     public ButtonListener(CodeMCBot bot){
         this.bot = bot;
@@ -61,6 +64,7 @@ public void onButtonInteraction(@NotNull ButtonInteractionEvent event){
 
         if(acceptApplicationRoles.isEmpty() || denyApplicationRoles.isEmpty()){
             CommandUtil.EmbedReply.from(event).error("No roles for accepting or denying applications set!").send();
+            logger.error("No roles for accepting or denying applications set!");
             return;
         }
 
@@ -69,8 +73,15 @@ public void onButtonInteraction(@NotNull ButtonInteractionEvent event){
             CommandUtil.EmbedReply.from(event).error("Cannot get Member from Server!").send();
             return;
         }
+
+        String id = event.getButton().getId();
+        if (id == null) {
+            CommandUtil.EmbedReply.from(event).error("Received Button Interaction with no ID!").send();
+            logger.error("Received Button Interaction with no ID!");
+            return;
+        }
 
-        String[] values = event.getButton().getId().split(":");
+        String[] values = id.split(":");
         if(values.length < 4 || !values[0].equals("application")){
             CommandUtil.EmbedReply.from(event).error("Received non-application button event!").send();
             return;