Fix DUNCTEBOT-TY

Author: duncte123

build.gradle.kts

@@ -35,7 +35,7 @@ plugins {
     id("org.jmailen.kotlinter") version "3.5.1"
 }
 
-val numberVersion = "3.106.5"
+val numberVersion = "3.106.6"
 
 project.group = "ml.duncte123.skybot"
 project.version = "${numberVersion}_${getGitHash()}"

src/main/java/ml/duncte123/skybot/SkyBot.java

@@ -54,21 +54,16 @@
 
 public final class SkyBot {
     private static SkyBot instance;
-    private final ShardManager shardManager;
-    private WebSocketClient client;
-
     private static final MemberCachePolicy PATRON_POLICY = (member) -> {
         // Member needs to be cached for JDA to fire role update event
         // the guild check is required for JDA to catch role updates in the support guild
         return member.getGuild().getIdLong() == Settings.SUPPORT_GUILD_ID &&
             member.getRoles().stream().anyMatch((role) -> role.getIdLong() == Settings.PATRONS_ROLE);
     };
+    private final ShardManager shardManager;
+    private WebSocketClient client;
 
-    // Sigh, might need to convert this to spring
-    @SuppressWarnings("PMD.AssignmentToNonFinalStatic")
     private SkyBot() throws LoginException {
-        instance = this;
-
         // Load in our container
         final Variables variables = new Variables();
 
@@ -102,13 +97,13 @@ private SkyBot() throws LoginException {
         final EventManager eventManager = new EventManager(variables);
         // Build our shard manager
         final DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(
-            GatewayIntent.GUILD_MEMBERS,
-            GatewayIntent.GUILD_INVITES,
-            GatewayIntent.GUILD_BANS,
-            GatewayIntent.GUILD_EMOJIS,
-            GatewayIntent.GUILD_VOICE_STATES,
-            GatewayIntent.GUILD_MESSAGES
-        )
+                GatewayIntent.GUILD_MEMBERS,
+                GatewayIntent.GUILD_INVITES,
+                GatewayIntent.GUILD_BANS,
+                GatewayIntent.GUILD_EMOJIS,
+                GatewayIntent.GUILD_VOICE_STATES,
+                GatewayIntent.GUILD_MESSAGES
+            )
             .setToken(token)
             .setShardsTotal(totalShards)
             .setActivityProvider((shardId) -> Activity.playing(
@@ -138,7 +133,7 @@ private SkyBot() throws LoginException {
         this.shardManager = builder.build();
 
         HelpEmbeds.init(commandManager);
-        
+
         if (config.websocket.enable) {
             client = new WebSocketClient(variables, shardManager);
         }
@@ -185,7 +180,7 @@ public WebSocketClient getWebsocketClient() {
     }
 
     public static void main(final String[] args) throws LoginException {
-        new SkyBot();
+        instance = new SkyBot();
     }
 
     public static SkyBot getInstance() {

src/main/kotlin/ml/duncte123/skybot/web/WebSocketClient.kt

@@ -213,7 +213,7 @@ class WebSocketClient(
     }
 
     private fun connect() {
-        if (socket != null && socket.isOpen) {
+        if (this::socket.isInitialized && socket.isOpen) {
             socket.sendClose(WebSocketCloseCode.NORMAL)
         }