Apply Discord regexes to message addon URLs (#1658)

DiscordSRV · Mar 29, 2024 · db167af · db167af
1 parent 12b4ada
commit db167af
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/github/scarsz/discordsrv/listeners/DiscordChatListener.java b/src/main/java/github/scarsz/discordsrv/listeners/DiscordChatListener.java
@@ -326,6 +326,15 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
     }
 
     private boolean handleMessageAddons(GuildMessageReceivedEvent event, DiscordGuildMessagePreProcessEvent preEvent, List<Role> selectedRoles, Role topRole, String url) {
+        // apply regex filters to url
+        for (Map.Entry<Pattern, String> entry : DiscordSRV.getPlugin().getDiscordRegexes().entrySet()) {
+            url = entry.getKey().matcher(url).replaceAll(entry.getValue());
+            if (StringUtils.isBlank(url)) {
+                DiscordSRV.debug(Debug.DISCORD_TO_MINECRAFT, "Not processing Discord message addon because its URL was cleared by a filter: " + entry.getKey().pattern());
+                return false;
+            }
+        }
+
         // get the correct format message
         String destinationGameChannelNameForTextChannel = DiscordSRV.getPlugin().getDestinationGameChannelNameForTextChannel(event.getChannel());
         String placedMessage = MessageFormatResolver.getMessageFormat(selectedRoles, destinationGameChannelNameForTextChannel);