Browse Source

fixed Metadata.Utils.scrub_html_and_truncate

tags/v1.1.9^2
Maksim Pechnikov rinpatch 4 years ago
parent
commit
f486556346
2 changed files with 34 additions and 0 deletions
  1. +2
    -0
      lib/pleroma/web/metadata/utils.ex
  2. +32
    -0
      test/web/metadata/utils_test.exs

+ 2
- 0
lib/pleroma/web/metadata/utils.ex View File

@@ -14,6 +14,7 @@ defmodule Pleroma.Web.Metadata.Utils do
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.get_cached_stripped_html_for_activity(object, "metadata")
|> Formatter.demojify()
|> HtmlEntities.decode()
|> Formatter.truncate()
end

@@ -24,6 +25,7 @@ defmodule Pleroma.Web.Metadata.Utils do
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> Formatter.demojify()
|> HtmlEntities.decode()
|> Formatter.truncate(max_length)
end



+ 32
- 0
test/web/metadata/utils_test.exs View File

@@ -0,0 +1,32 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only

defmodule Pleroma.Web.Metadata.UtilsTest do
use Pleroma.DataCase
import Pleroma.Factory
alias Pleroma.Web.Metadata.Utils

describe "scrub_html_and_truncate/1" do
test "it returns text without encode HTML" do
user = insert(:user)

note =
insert(:note, %{
data: %{
"actor" => user.ap_id,
"id" => "https://pleroma.gov/objects/whatever",
"content" => "Pleroma's really cool!"
}
})

assert Utils.scrub_html_and_truncate(note) == "Pleroma's really cool!"
end
end

describe "scrub_html_and_truncate/2" do
test "it returns text without encode HTML" do
assert Utils.scrub_html_and_truncate("Pleroma's really cool!") == "Pleroma's really cool!"
end
end
end

Loading…
Cancel
Save