Merge pull request muety#565 from Juneezee/perf/regexp-matchstring

perf: avoid allocations with `(*regexp.Regexp).MatchString`
liaosunny123 · Nov 24, 2023 · 8449348 · 8449348
2 parents c714085 + cbdf341
commit 8449348
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/models/mail_address.go b/models/mail_address.go
@@ -48,7 +48,7 @@ func (m MailAddress) Domain() string {
 }
 
 func (m MailAddress) Valid() bool {
-	return emailAddrRegex.Match([]byte(m))
+	return emailAddrRegex.MatchString(string(m))
 }
 
 func (m MailAddresses) Strings() []string {

diff --git a/models/user.go b/models/user.go
@@ -198,7 +198,7 @@ func ValidatePassword(password string) bool {
 
 // ValidateEmail checks that, if an email address is given, it has proper syntax and (if not in dev mode) an MX record exists for the domain
 func ValidateEmail(email string) bool {
-	return email == "" || (mailRegex.Match([]byte(email)) && (conf.Get().IsDev() || utils.CheckEmailMX(email)))
+	return email == "" || (mailRegex.MatchString(email) && (conf.Get().IsDev() || utils.CheckEmailMX(email)))
 }
 
 func ValidateTimezone(tz string) bool {

diff --git a/scripts/email_checker.go b/scripts/email_checker.go
@@ -31,7 +31,7 @@ func CheckEmailMX(email string) bool {
 }
 
 func ValidateEmail(email string) bool {
-	return mailRegex.Match([]byte(email)) && CheckEmailMX(email)
+	return mailRegex.MatchString(email) && CheckEmailMX(email)
 }
 
 func main() {