Add missing cache cleanup for news/stage/thread channels (#2029)

discord-jda · Feb 19, 2022 · e328d17 · e328d17
1 parent a77218c
commit e328d17
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/main/java/net/dv8tion/jda/internal/handle/GuildDeleteHandler.java b/src/main/java/net/dv8tion/jda/internal/handle/GuildDeleteHandler.java
@@ -64,11 +64,20 @@ protected Long handleInternally(DataObject content)
         //Remove everything from global cache
         // this prevents some race-conditions for getting audio managers from guilds
         SnowflakeCacheViewImpl<Guild> guildView = getJDA().getGuildsView();
+        SnowflakeCacheViewImpl<StageChannel> stageView = getJDA().getStageChannelView();
         SnowflakeCacheViewImpl<StoreChannel> storeView = getJDA().getStoreChannelsView();
         SnowflakeCacheViewImpl<TextChannel> textView = getJDA().getTextChannelsView();
+        SnowflakeCacheViewImpl<ThreadChannel> threadView = getJDA().getThreadChannelsView();
+        SnowflakeCacheViewImpl<NewsChannel> newsView = getJDA().getNewsChannelView();
         SnowflakeCacheViewImpl<VoiceChannel> voiceView = getJDA().getVoiceChannelsView();
         SnowflakeCacheViewImpl<Category> categoryView = getJDA().getCategoriesView();
+
         guildView.remove(id);
+        try (UnlockHook hook = stageView.writeLock())
+        {
+            guild.getStageChannelCache()
+                    .forEachUnordered(chan -> stageView.getMap().remove(chan.getIdLong()));
+        }
         try (UnlockHook hook = storeView.writeLock())
         {
             guild.getStoreChannelCache()
@@ -79,6 +88,16 @@ protected Long handleInternally(DataObject content)
             guild.getTextChannelCache()
                  .forEachUnordered(chan -> textView.getMap().remove(chan.getIdLong()));
         }
+        try (UnlockHook hook = threadView.writeLock())
+        {
+            guild.getThreadChannelsView()
+                    .forEachUnordered(chan -> threadView.getMap().remove(chan.getIdLong()));
+        }
+        try (UnlockHook hook = newsView.writeLock())
+        {
+            guild.getNewsChannelCache()
+                    .forEachUnordered(chan -> newsView.getMap().remove(chan.getIdLong()));
+        }
         try (UnlockHook hook = voiceView.writeLock())
         {
             guild.getVoiceChannelCache()