projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply 4 suggestion(s) to 2 file(s)
[akkoma]
/
lib
/
pleroma
/
html.ex
diff --git
a/lib/pleroma/html.ex
b/lib/pleroma/html.ex
index 43e9145be6503f9cd85fbd879303b4e8b32112ca..c5ece7350247e9fc69e8fa383063cad79d723622 100644
(file)
--- a/
lib/pleroma/html.ex
+++ b/
lib/pleroma/html.ex
@@
-6,6
+6,8
@@
defmodule Pleroma.HTML do
# Scrubbers are compiled on boot so they can be configured in OTP releases
# @on_load :compile_scrubbers
# Scrubbers are compiled on boot so they can be configured in OTP releases
# @on_load :compile_scrubbers
+ @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+
def compile_scrubbers do
dir = Path.join(:code.priv_dir(:pleroma), "scrubbers")
def compile_scrubbers do
dir = Path.join(:code.priv_dir(:pleroma), "scrubbers")
@@
-56,8
+58,8
@@
defmodule Pleroma.HTML do
) do
key = "#{key}#{generate_scrubber_signature(scrubbers)}|#{activity.id}"
) do
key = "#{key}#{generate_scrubber_signature(scrubbers)}|#{activity.id}"
-
C
achex.fetch!(:scrubber_cache, key, fn _key ->
- object = Pleroma.Object.normalize(activity)
+
@c
achex.fetch!(:scrubber_cache, key, fn _key ->
+ object = Pleroma.Object.normalize(activity
, fetch: false
)
ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
end)
end
ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
end)
end
@@
-105,7
+107,7
@@
defmodule Pleroma.HTML do
unless object.data["fake"] do
key = "URL|#{object.id}"
unless object.data["fake"] do
key = "URL|#{object.id}"
-
C
achex.fetch!(:scrubber_cache, key, fn _key ->
+
@c
achex.fetch!(:scrubber_cache, key, fn _key ->
{:commit, {:ok, extract_first_external_url(content)}}
end)
else
{:commit, {:ok, extract_first_external_url(content)}}
end)
else