Add placeholder lookup handling for all Discord channel types

DiscordSRV · Oct 20, 2024 · a8752dd · a8752dd
1 parent b82840b
commit a8752dd
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java b/common/src/main/java/com/discordsrv/common/discord/connection/jda/JDAConnectionManager.java
@@ -51,7 +51,7 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.entities.channel.concrete.*;
+import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.events.StatusChangeEvent;
 import net.dv8tion.jda.api.events.session.SessionDisconnectEvent;
 import net.dv8tion.jda.api.events.session.ShutdownEvent;
@@ -232,16 +232,13 @@ public void onPlaceholderLookup(PlaceholderLookupEvent event) {
         for (Object o : event.getContexts()) {
             Object converted;
             boolean isConversion = true;
-            if (o instanceof PrivateChannel) {
-                converted = api().getDirectMessageChannel((PrivateChannel) o);
-            } else if (o instanceof TextChannel) {
-                converted = api().getTextChannel((TextChannel) o);
-            } else if (o instanceof ThreadChannel) {
-                converted = api().getThreadChannel((ThreadChannel) o);
-            } else if (o instanceof VoiceChannel) {
-                converted = api().getVoiceChannel((VoiceChannel) o);
-            } else if (o instanceof StageChannel) {
-                converted = api().getStageChannel((StageChannel) o);
+            if (o instanceof Channel) {
+                try {
+                    converted = api().getChannel((Channel) o);
+                } catch (IllegalArgumentException e) {
+                    discordSRV.logger().debug("Failed to map " + o.getClass().getName(), e);
+                    converted = o;
+                }
             } else if (o instanceof Guild) {
                 converted = api().getGuild((Guild) o);
             } else if (o instanceof Member) {