hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move scrubber cache-related functions to Pleroma.HTML

Browse source
This commit is contained in:
Rin Toshaka 2018-12-31 08:19:48 +01:00
commit 7e09c2bd7d
4 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -11,6 +11,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Activity
alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Repo
@ -244,14 +245,14 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
|> Object.get_cached_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
|> HTML.get_cached_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
|> Formatter.emojify(object["emoji"])
text =
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
|> Object.get_cached_stripped_html(activity)
|> HTML.get_cached_stripped_html_for_object(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)