diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-24 20:34:23 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-24 20:34:23 +0000 |
| commit | 625fec58ffb598be9a2afaf693c923ccf90a465d (patch) | |
| tree | dbb7d75ddf23eed3dd173148da306431e90ab017 /lib | |
| parent | 8a0ee011ac7b679876eb7d81547dde416c208af1 (diff) | |
| parent | bbea5691da67916151a883f09e24da7c2e27d9ba (diff) | |
| download | pleroma-625fec58ffb598be9a2afaf693c923ccf90a465d.tar.gz | |
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'
Mention all people in the beginning of DM
Closes #924
See merge request pleroma/pleroma!1194
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 3e3b9fe97..607843a5b 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -8,7 +8,7 @@ defmodule Pleroma.Formatter do alias Pleroma.User alias Pleroma.Web.MediaProxy - @safe_mention_regex ~r/^(\s*(?<mentions>@.+?\s+)+)(?<rest>.*)/s + @safe_mention_regex ~r/^(\s*(?<mentions>(@.+?\s+){1,})+)(?<rest>.*)/s @link_regex ~r"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~%:/?#[\]@!\$&'\(\)\*\+,;=.]+)|[0-9a-z+\-\.]+:[0-9a-z$-_.+!*'(),]+"ui @markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/ |