squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

strip_html/1 is only called for titles of RSS feeds now, so move it

Browse Source
This commit is contained in:
Mark Felder 2021-06-11 13:59:32 -05:00
parent 2ad52086b8
commit 65137044c1
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/feed/feed_view.ex
View File

@ -7,6 +7,7 @@ defmodule Pleroma.Web.Feed.FeedView do
use Pleroma.Web, :view use Pleroma.Web, :view
alias Pleroma.Formatter alias Pleroma.Formatter
alias Pleroma.HTML
alias Pleroma.Object alias Pleroma.Object
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
@ -70,7 +71,9 @@ defmodule Pleroma.Web.Feed.FeedView do
def activity_title(%{"content" => content}, opts \\ %{}) do def activity_title(%{"content" => content}, opts \\ %{}) do
content content
|> Pleroma.Web.Metadata.Utils.scrub_html() |> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> Pleroma.Emoji.Formatter.demojify() |> Pleroma.Emoji.Formatter.demojify()
|> Formatter.truncate(opts[:max_length], opts[:omission]) |> Formatter.truncate(opts[:max_length], opts[:omission])
|> escape() |> escape()

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

@ -6,7 +6,6 @@ defmodule Pleroma.Web.Metadata.Utils do
alias Pleroma.Activity alias Pleroma.Activity
alias Pleroma.Emoji alias Pleroma.Emoji
alias Pleroma.Formatter alias Pleroma.Formatter
alias Pleroma.HTML
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
content content
@ -21,22 +20,12 @@ defmodule Pleroma.Web.Metadata.Utils do
def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
content content
|> scrub_html
|> Emoji.Formatter.demojify() |> Emoji.Formatter.demojify()
|> HtmlEntities.decode() |> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> Formatter.truncate(max_length) |> Formatter.truncate(max_length)
end end
def scrub_html(content) when is_binary(content) do
content
# html content comes from DB already encoded, decode first and scrub after
|> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
end
def scrub_html(content), do: content
def user_name_string(user) do def user_name_string(user) do
"#{user.name} " <> "#{user.name} " <>
if user.local do if user.local do