nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Friendship ended with Postgresql now Cachex is my best friend

Browse source
This commit is contained in:
Rin Toshaka 2018-12-30 19:33:36 +01:00
parent d9f40b05b3
commit 535fddd286
6 changed files with 49 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/application.ex
View file

@ -53,6 +53,16 @@ def start(_type, _args) do
],
id: :cachex_object
),
worker(
Cachex,
[
:scrubber_cache,
[
limit: 2500
]
],
id: :cachex_scrubber
),
worker(
Cachex,
[

34
lib/pleroma/object.ex
View file

@ -4,7 +4,7 @@
defmodule Pleroma.Object do
use Ecto.Schema
alias Pleroma.{Repo, Object, User, Activity}
alias Pleroma.{Repo, Object, User, Activity, HTML}
import Ecto.{Query, Changeset}
schema "objects" do
@ -73,4 +73,36 @@ def delete(%Object{data: %{"id" => id}} = object) do
{:ok, object}
end
end
def get_cached_scrubbed_html(content, scrubbers, object) do
key = "#{generate_scrubber_signature(scrubbers)}|#{object.id}"
Cachex.fetch!(:scrubber_cache, key, fn(_key) -> ensure_scrubbed_html(content, scrubbers) end )
end
def get_cached_stripped_html(content, object) do
get_cached_scrubbed_html(content, HtmlSanitizeEx.Scrubber.StripTags, object)
end
def ensure_scrubbed_html(
content,
scrubbers
) do
{:commit, HTML.filter_tags(content, scrubbers)}
end
defp generate_scrubber_signature(scrubber) when is_atom(scrubber) do
generate_scrubber_signature([scrubber])
end
defp generate_scrubber_signature(scrubbers) do
Enum.reduce(scrubbers, "", fn scrubber, signature ->
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
version = if Kernel.function_exported?(scrubber, :version, 0) do
scrubber.version
else
0
end
"#{signature}#{to_string(scrubber)}#{version}"
end)
end
end

3
lib/pleroma/web/common_api/common_api.ex
View file

@ -128,8 +128,7 @@ def post(user, %{"status" => status} = data) do
|> Enum.reduce(%{}, fn {name, file}, acc ->
Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url()}#{file}")
end)
),
object <- Map.put(object, "scrubber_cache", %{}) do
) do
res =
ActivityPub.create(%{
to: to,

81
lib/pleroma/web/common_api/utils.ex
View file

@ -5,7 +5,7 @@
defmodule Pleroma.Web.CommonAPI.Utils do
alias Calendar.Strftime
alias Comeonin.Pbkdf2
alias Pleroma.{Activity, Formatter, Object, Repo, HTML}
alias Pleroma.{Activity, Formatter, Object, Repo}
alias Pleroma.User
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Utils
@ -262,83 +262,4 @@ def emoji_from_profile(%{info: _info} = user) do
end)
end
def get_scrubbed_html_for_object(content, scrubber, activity) when is_atom(scrubber) do
get_scrubbed_html_for_object(content, [scrubber], activity)
end
@doc """
Get sanitized HTML from cache, or scrub it and save to cache.
"""
def get_scrubbed_html_for_object(
content,
scrubbers,
%{data: %{"object" => object}} = activity
) do
scrubber_cache =
if is_list(object["scrubber_cache"]) do
object["scrubber_cache"]
else
[]
end
signature = generate_scrubber_signature(scrubbers)
{new_scrubber_cache, scrubbed_html} =
Enum.map_reduce(scrubber_cache, nil, fn
entry, content ->
if Map.keys(entry["scrubbers"]) == Map.keys(signature) do
if entry["scrubbers"] == signature do
{entry, entry["content"]}
else
# Remove the entry if scrubber version is outdated
{nil, nil}
end
else
{entry, content}
end
end)
# Remove nil objects
new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do
scrubbed_html = HTML.filter_tags(content, scrubbers)
new_scrubber_cache = [
%{:scrubbers => signature, :content => scrubbed_html} | new_scrubber_cache
]
update_scrubber_cache(activity, new_scrubber_cache)
scrubbed_html
else
scrubbed_html
end
end
defp generate_scrubber_signature(scrubbers) do
Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
Map.put(
signature,
to_string(scrubber),
# If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
if Kernel.function_exported?(scrubber, :version, 0) do
scrubber.version
else
0
end
)
end)
end
defp update_scrubber_cache(activity, scrubber_cache) do
cng =
Object.change(activity, %{
data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)
})
{:ok, _struct} = Repo.update(cng)
end
def get_stripped_html_for_object(content, activity) do
get_scrubbed_html_for_object(content, [HtmlSanitizeEx.Scrubber.StripTags], activity)
end
end

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

@ -9,6 +9,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.HTML
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MastodonAPI.AccountView
@ -120,7 +121,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
content =
object
|> render_content()
|> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
|> Object.get_cached_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
%{
id: to_string(activity.id),

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

@ -244,14 +244,14 @@ def render(
html =
content
|> Utils.get_scrubbed_html_for_object(User.html_filter_policy(opts[:for]), activity)
|> Object.get_cached_scrubbed_html(User.html_filter_policy(opts[:for]), activity)
|> Formatter.emojify(object["emoji"])
text =
if content do
content
|> String.replace(~r/<br\s?\/?>/, "\n")
|> Utils.get_stripped_html_for_object(activity)
|> Object.get_cached_stripped_html(activity)
end
reply_parent = Activity.get_in_reply_to_activity(activity)