From 2cdfef9d8ac9e019ff7ab01e14853c378ec3ec7f Mon Sep 17 00:00:00 2001
From: oko <oko403@protonmail.com>
Date: Fri, 20 May 2022 16:13:55 -0700
Subject: [PATCH] added correct handling for welcomeChannel variable mismatch.

---
 .../moe/oko/Kiafumi/listener/MainListener.java  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/moe/oko/Kiafumi/listener/MainListener.java b/src/main/java/moe/oko/Kiafumi/listener/MainListener.java
index 99372f3..9a098c9 100644
--- a/src/main/java/moe/oko/Kiafumi/listener/MainListener.java
+++ b/src/main/java/moe/oko/Kiafumi/listener/MainListener.java
@@ -5,6 +5,7 @@ import moe.oko.Kiafumi.util.EmbedUI;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
@@ -120,9 +121,11 @@ public class MainListener extends ListenerAdapter {
         if(server.isWelcomeEnabled()) {
             info("User [" + event.getUser().getName() + ":" + event.getUser().getId() + "] joined guild [" + event.getGuild().getName() + ':' + event.getGuild().getId() + "].");
             // Fetch the welcome channel from settings.
-            var textChannel = event.getGuild().getTextChannelById(server.getWelcomeChannel());
-            if(textChannel == null) {
-                error("Failed to send welcome message to guild " + event.getGuild().getId() + " as the welcome channel was not found.");
+            TextChannel textChannel;
+            try {
+                textChannel = event.getGuild().getTextChannelById(server.getWelcomeChannel());
+            } catch (Exception ex) {
+                error("Failed to send join message to guild " + event.getGuild().getId() + " as the welcome channel was not found.");
                 return;
             }
             var dTF = DateTimeFormatter.ofPattern("MM-dd-yyyy");
@@ -140,11 +143,13 @@ public class MainListener extends ListenerAdapter {
     @Override
     public void onGuildMemberRemove(@NotNull GuildMemberRemoveEvent event) {
         info("User [" + event.getUser().getName() + ":" + event.getUser().getId() + "] left guild [" + event.getGuild().getName() + ':' + event.getGuild().getId() + "].");
-        // Fetch the welcome channel from settings.
         var server = Kiafumi.instance.getServerManager().getOrCreateServer(event.getGuild());
         if(server.isWelcomeEnabled()) {
-            var textChannel = event.getGuild().getTextChannelById(server.getWelcomeChannel());
-            if(textChannel == null) {
+            // Fetch the welcome channel from settings.
+            TextChannel textChannel;
+            try {
+                textChannel = event.getGuild().getTextChannelById(server.getWelcomeChannel());
+            } catch (Exception ex) {
                 error("Failed to send leave message to guild " + event.getGuild().getId() + " as the welcome channel was not found.");
                 return;
             }