diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-18 20:23:21 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-18 20:23:21 +0000 |
| commit | b7f635010710147f0682c538ebf783066124f0d4 (patch) | |
| tree | 15fa1e5e7544749c3cd51b879454145ffbe0b317 /lib | |
| parent | 443d59baa05165c3b5b7ab14f3eabd6f2eba09f2 (diff) | |
| parent | 196d9c0fd089942deff62aeeea60bef1972cbe38 (diff) | |
| download | pleroma-b7f635010710147f0682c538ebf783066124f0d4.tar.gz pleroma-b7f635010710147f0682c538ebf783066124f0d4.zip | |
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'
[#441] Fix characters converted to HTML being picked up by hashtag parser
See merge request pleroma/pleroma!575
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/formatter.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 46d0d926a..9401689cb 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -4,12 +4,12 @@ defmodule Pleroma.Formatter do alias Pleroma.HTML alias Pleroma.Emoji - @tag_regex ~r/\#\w+/u + @tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u @markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/ def parse_tags(text, data \\ %{}) do Regex.scan(@tag_regex, text) - |> Enum.map(fn ["#" <> tag = full_tag] -> {full_tag, String.downcase(tag)} end) + |> Enum.map(fn ["#" <> tag = full_tag | _] -> {full_tag, String.downcase(tag)} end) |> (fn map -> if data["sensitive"] in [true, "True", "true", "1"], do: [{"#nsfw", "nsfw"}] ++ map, @@ -155,7 +155,7 @@ defmodule Pleroma.Formatter do uuid_text = tags |> Enum.reduce(text, fn {match, _short, uuid}, text -> - String.replace(text, match, uuid) + String.replace(text, ~r/((?<=[^&])|(\A))#{match}/, uuid) end) subs = |