tweak \D and comment block for at-username regex

lichess-org · May 24, 2016 · 5cfe876 · niklasf · May 24, 2016 · Unihedro
1 parent ae15add
commit 5cfe876
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/templating/StringHelper.scala b/app/templating/StringHelper.scala
@@ -47,12 +47,12 @@ trait StringHelper { self: NumberHelper =>
  }
  }
 
- // Matches a lichess username with a '@' prefix only if it doesn't follow another '@',
- // if it isn't after a word character (that'd be an email) and fits constains in
+ // Matches a lichess username with a '@' prefix only if the next char isn't a digit,
+ // if it isn't after a word character (that'd be an email) and fits constraints in
  // https://github.com/ornicar/lila/blob/master/modules/security/src/main/DataForm.scala#L34-L44
  // Example: everyone says @ornicar is a pretty cool guy
  // False example: Write to [email protected], @1
- private val atUsernameRegex = """\B@(?>\D[\w-]{1,19})(?![\w-])""".r
+ private val atUsernameRegex = """\B@(?>[a-zA-Z_-][\w-]{1,19})(?![\w-])""".r
 
  private val urlRegex = """(?i)\b((?:https?:https://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s<>]+|\(([^\s<>]+|(\([^\s<>]+\)))*\))+(?:\(([^\s<>]+|(\([^\s<>]+\)))*\)|[^\s`!\[\]{};:'".,<>?«»“”‘’]))""".r