AkkomaGang/akkoma
AkkomaGang/akkoma
15
66
Fork 94
Code Issues 180 Pull requests 28 Projects 2 Releases 14 Packages Wiki Activity

Ignore HTML characters in formatter.ex

Browse source
This commit is contained in:
rinpatch 2018-12-18 21:38:15 +03:00
parent 8cb9580aec
commit 059dd6f681
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/formatter.ex
View file

@ -4,12 +4,12 @@ defmodule Pleroma.Formatter do
alias Pleroma.HTML alias Pleroma.HTML
alias Pleroma.Emoji alias Pleroma.Emoji
@tag_regex ~r/\#\w+/u @tag_regex ~r/((?<=[^&])|\A)(\#)(\w+)/u
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/ @markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
def parse_tags(text, data \\ %{}) do def parse_tags(text, data \\ %{}) do
Regex.scan(@tag_regex, text) 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 -> |> (fn map ->
if data["sensitive"] in [true, "True", "true", "1"], if data["sensitive"] in [true, "True", "true", "1"],
do: [{"#nsfw", "nsfw"}] ++ map, do: [{"#nsfw", "nsfw"}] ++ map,
@ -155,7 +155,7 @@ def add_hashtag_links({subs, text}, tags) do
uuid_text = uuid_text =
tags tags
|> Enum.reduce(text, fn {match, _short, uuid}, text -> |> Enum.reduce(text, fn {match, _short, uuid}, text ->
String.replace(text, match, uuid) String.replace(text, ~r/((?<=[^&])|(\A))#{match}/, uuid)
end) end)
subs = subs =