diff options
author | kaniini <nenolod@gmail.com> | 2018-08-24 18:42:14 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-08-24 18:42:14 +0000 |
commit | be7a6db1f54a033afb7cb564f9cf0c9bdafe5055 (patch) | |
tree | f2fcb8820d7c249396c673cd25e056a85b3bdd8e /lib | |
parent | 9ded0ee1a5ac5b60dfca983fee3875690336fa70 (diff) | |
parent | a8bd120ea620d3bb86018318bbc013de2c613af0 (diff) | |
download | pleroma-be7a6db1f54a033afb7cb564f9cf0c9bdafe5055.tar.gz |
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'
formatter: fix single char local nicknames
Closes #163
See merge request pleroma/pleroma!290
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/formatter.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 3e71a3b5f..cf2944c38 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -16,7 +16,7 @@ defmodule Pleroma.Formatter do def parse_mentions(text) do # Modified from https://www.w3.org/TR/html5/forms.html#valid-e-mail-address regex = - ~r/@[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])?)*/u + ~r/@[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])?)*/u Regex.scan(regex, text) |> List.flatten() |