diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-08-14 17:56:45 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-08-14 17:56:45 +0200 |
| commit | 2ab1d915e3a7db329f09332e8b688e4bd405b748 (patch) | |
| tree | c984c15a0529cc386329719698e1d27aa1c451d2 /lib | |
| parent | 7d34cec58d0a9fda1741e1c0c9c23b0895a2cc2e (diff) | |
| download | pleroma-2ab1d915e3a7db329f09332e8b688e4bd405b748.tar.gz | |
Use unicode regex in mentions and links.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 179c33560..5c19d8f87 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -1,7 +1,7 @@ defmodule Pleroma.Formatter do alias Pleroma.User - @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/ + @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/u def linkify(text) do Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>") end @@ -14,7 +14,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])?)*/ + 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 Regex.scan(regex, text) |> List.flatten |