diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-31 09:56:26 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-31 09:56:26 +0000 |
| commit | 33e3a7ba7dab750f2a5f85e22b0e44251ec308d2 (patch) | |
| tree | 8092c3946ccd8cb369d6696a1ba4d4fbf2764d8e /lib/pleroma/web/twitter_api | |
| parent | 8e7da98b18a6f43e6bfd7321904f626cebd357bb (diff) | |
| parent | 9f5881cbb1957a286d9b191e3d5be7f06b5a2941 (diff) | |
| download | pleroma-33e3a7ba7dab750f2a5f85e22b0e44251ec308d2.tar.gz | |
Merge branch 'fix/scrubber-cache' into 'develop'
[#481] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 592cf622f..469f780c7 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -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) |