moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify Utils.scrub_html_and_truncate to take omission parameter

This commit is contained in:
faried nawaz 2023-03-06 02:30:52 +05:00
parent 117a53b88e
commit 86ee4b72f3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/metadata/utils.ex
View File

@ -30,12 +30,13 @@ def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
|> scrub_html_and_truncate_object_field(object) |> scrub_html_and_truncate_object_field(object)
end end
def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do def scrub_html_and_truncate(content, max_length \\ 200, omission \\ "...")
when is_binary(content) do
content content
|> scrub_html |> scrub_html
|> Emoji.Formatter.demojify() |> Emoji.Formatter.demojify()
|> HtmlEntities.decode() |> HtmlEntities.decode()
|> Formatter.truncate(max_length) |> Formatter.truncate(max_length, omission)
end end
def scrub_html(content) when is_binary(content) do def scrub_html(content) when is_binary(content) do

2
test/pleroma/web/metadata/utils_test.exs
View File

@ -72,7 +72,7 @@ test "it does not return old content after editing" do
end end
end end
describe "scrub_html_and_truncate/2" do describe "scrub_html_and_truncate/3" do
test "it returns text without encode HTML" do test "it returns text without encode HTML" do
assert Utils.scrub_html_and_truncate("Pleroma's really cool!") == "Pleroma's really cool!" assert Utils.scrub_html_and_truncate("Pleroma's really cool!") == "Pleroma's really cool!"
end end