hotmail sucks ass
This commit is contained in:
parent
09e15859e3
commit
22f20a0d4a
|
@ -40,8 +40,16 @@
|
|||
<h3>Wait up to 5 minutes.</h3><br />
|
||||
Depending on your email provider, it can take a while to arrive.
|
||||
</li>
|
||||
@if(userEmail.exists(_.email.isHotmail)) {
|
||||
<li>
|
||||
<h3>Hotmail addresses are notoriously bad.</h3><br />
|
||||
Your confirmation email may never arrive on this address.<br />
|
||||
Consider using a different one.
|
||||
</li>
|
||||
}
|
||||
<li>
|
||||
<h3>Still not getting it?</h3><br />
|
||||
Did you make sure your email address is correct?<br />
|
||||
Ask @contactEmailLink and we'll confirm your email for you.<br />
|
||||
<strong>Don't forget to mention your username.</strong>
|
||||
</li>
|
||||
|
|
|
@ -28,13 +28,17 @@ object IpAddress {
|
|||
} option IpAddress(str)
|
||||
}
|
||||
|
||||
case class EmailAddress(value: String) extends AnyVal with StringValue
|
||||
case class EmailAddress(value: String) extends AnyVal with StringValue {
|
||||
def isHotmail = EmailAddress.hotmailPattern.matcher(value).find
|
||||
}
|
||||
|
||||
object EmailAddress {
|
||||
|
||||
private val regex =
|
||||
"""^[a-zA-Z0-9\.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$""".r
|
||||
private val pattern =
|
||||
"""^[a-zA-Z0-9\.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$""".r.pattern
|
||||
|
||||
def from(str: String): Option[EmailAddress] =
|
||||
regex.matches(str) option EmailAddress(str)
|
||||
pattern.matcher(str).find option EmailAddress(str)
|
||||
|
||||
private val hotmailPattern = """(.*)@(live|hotmail)\.(.*)""".r.pattern
|
||||
}
|
||||
|
|
|
@ -119,6 +119,9 @@ div.checkmateCaptcha label {
|
|||
.email_confirm.anim ol li:nth-child(4) {
|
||||
animation-delay: 14s;
|
||||
}
|
||||
.email_confirm.anim ol li:nth-child(5) {
|
||||
animation-delay: 18s;
|
||||
}
|
||||
#email_confirm a {
|
||||
display: none;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue