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

Merge branch 'fix/scrubber-cache' into 'develop'

Browse source 
[#481] Store scrubbed posts in Cachex

Closes #481

See merge request pleroma/pleroma!610
This commit is contained in:
lambda 2018-12-31 09:56:26 +00:00
commit 33e3a7ba7d
6 changed files with 70 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View file

@ -120,7 +120,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
content =
object
|> render_content()
|> HTML.filter_tags(User.html_filter_policy(opts[:for]))
|> HTML.get_cached_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
%{
id: to_string(activity.id),

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

@ -11,11 +11,11 @@ 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
alias Pleroma.Formatter
alias Pleroma.HTML
import Ecto.Query
require Logger
@ -245,14 +245,14 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
html =
content
|> HTML.filter_tags(User.html_filter_policy(opts[:for]))
|> 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")
|> HTML.strip_tags()
|> HTML.get_cached_stripped_html_for_object(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)