couple websocket and ratelimit fixes

discord-jar · Nov 13, 2024 · bee9ae9 · bee9ae9
1 parent 1382866
commit bee9ae9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/com/seailz/discordjar/DiscordJar.java b/src/main/java/com/seailz/discordjar/DiscordJar.java
@@ -399,7 +399,9 @@ public Bucket getBucket(String id) {
     }
 
     public void updateBucket(String id, Bucket bucket) {
+        if (bucket == null) return;
         for (int i = 0; i < buckets.size(); i++) {
+            if (buckets.get(i) == null) continue;
             if (buckets.get(i).id().equals(id)) {
                 buckets.remove(i);
                 return;
@@ -415,9 +417,9 @@ public void removeBucket(Bucket bucket) {
     public Bucket getBucketForUrl(String url) {
         final List<Bucket> buckets = new ArrayList<>(this.buckets);
         for (Bucket bucket : buckets) {
+            if (bucket == null) continue;
             List<String> affectedRoutes = bucket.getAffectedRoutes();
             if (affectedRoutes == null) continue;
-            if (bucket == null) continue;
             if (affectedRoutes.contains(url)) return bucket;
         }
         return null;

diff --git a/src/main/java/com/seailz/discordjar/ws/WebSocket.java b/src/main/java/com/seailz/discordjar/ws/WebSocket.java
@@ -182,6 +182,8 @@ public void onFailure(@NotNull okhttp3.WebSocket webSocket, @NotNull Throwable t
                 e.printStackTrace();
             }
         }
+
+        webSocket.close(1006, t.getMessage());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
                     e.printStackTrace();
                 }
             }
+            webSocket.close(1006, t.getMessage());
         }
         /**
@@ Expand Down @@