From dc2479889aaa87883bdd6b36f8475451a095f2f7 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sun, 23 May 2021 23:17:29 +0200 Subject: [PATCH] [AB-xxx] making regex checks ignore case --- .../abstracto/linkembed/service/MessageEmbedServiceBean.java | 2 +- .../sheldan/abstracto/core/service/ProfanityServiceBean.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java index 43352f01f..b3aac28e8 100644 --- a/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java +++ b/abstracto-application/abstracto-modules/link-embed/link-embed-impl/src/main/java/dev/sheldan/abstracto/linkembed/service/MessageEmbedServiceBean.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; @Slf4j public class MessageEmbedServiceBean implements MessageEmbedService { - private final Pattern messageRegex = Pattern.compile("(?(?:https?://)?(?:\\w+\\.)?discord(?:app)?\\.com/channels/(?\\d+)/(?\\d+)/(?\\d+)(?:.*?))+"); + private final Pattern messageRegex = Pattern.compile("(?(?:https?://)?(?:\\w+\\.)?discord(?:app)?\\.com/channels/(?\\d+)/(?\\d+)/(?\\d+)(?:.*?))+", Pattern.CASE_INSENSITIVE); public static final String MESSAGE_EMBED_TEMPLATE = "message_embed"; public static final String REMOVAL_EMOTE = "removeEmbed"; diff --git a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java index 0b194997b..1412f0b83 100644 --- a/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java +++ b/abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ProfanityServiceBean.java @@ -143,7 +143,7 @@ public class ProfanityServiceBean implements ProfanityService { } private void loadProfanityRegex(ProfanityRegex profanityRegex, Long serverId) { - Pattern pattern = Pattern.compile(profanityRegex.getRegex()); + Pattern pattern = Pattern.compile(profanityRegex.getRegex(), Pattern.CASE_INSENSITIVE); List newPatterns = new ArrayList<>(); PatternReplacement patternReplacement = PatternReplacement .builder()