Merge pull request #316 from Java-Discord/moon/email-fix

Author: jasonlessenich

build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     implementation("com.google.code.gson:gson:2.9.0")
     implementation("org.yaml:snakeyaml:1.30")
     implementation("com.google.re2j:re2j:1.6")
+    implementation("commons-validator:commons-validator:1.7")
 
     implementation("ch.qos.logback:logback-classic:1.2.11")
     implementation("com.mashape.unirest:unirest-java:1.4.9")

src/main/java/net/javadiscord/javabot/systems/staff/self_roles/SelfRoleInteractionManager.java

@@ -18,6 +18,7 @@
 import net.javadiscord.javabot.command.Responses;
 import net.javadiscord.javabot.data.config.GuildConfig;
 import net.javadiscord.javabot.data.config.guild.ModerationConfig;
+import org.apache.commons.validator.routines.EmailValidator;
 
 import java.time.Instant;
 
@@ -27,8 +28,6 @@
 @Slf4j
 public class SelfRoleInteractionManager {
 
-	private final String EMAIL_PATTERN = "[\\w-]+@([\\w-]+\\.)+[\\w-]+";
-
 	/**
 	 * Handles all Button Interactions regarding the Self Role System.
 	 *
@@ -170,7 +169,7 @@ private WebhookMessageAction<Message> sendStaffSubmission(ModalInteractionEvent
 		var emailOption = event.getValue("email");
 		var timezoneOption = event.getValue("timezone");
 		var extraRemarksOption = event.getValue("extra-remarks");
-		if(!emailOption.getAsString().matches(EMAIL_PATTERN)) {
+		if(!EmailValidator.getInstance().isValid(emailOption.getAsString())) {
 			return Responses.error(event.getHook(), String.format("`%s` is not a valid Email-Address. Please try again.", emailOption.getAsString()));
 		}
 		Role role = event.getGuild().getRoleById(roleId);