aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-10-29 20:58:54 +0300
committerrinpatch <rinpatch@sdf.org>2019-10-29 20:58:54 +0300
commit77cfb08b8c4c07406af8b338ce010307f6af75cb (patch)
treedfbd53ed86c03617afbd7d7dce648f4f84b53005 /lib
parent61400d7eb785f41ab853f42d0a221357253c39eb (diff)
downloadpleroma-77cfb08b8c4c07406af8b338ce010307f6af75cb.tar.gz
Remove commented-out code
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/html.ex3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
index fd0495049..294bc75f9 100644
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@@ -3,7 +3,6 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.HTML do
-
defp get_scrubbers(scrubber) when is_atom(scrubber), do: [scrubber]
defp get_scrubbers(scrubbers) when is_list(scrubbers), do: scrubbers
defp get_scrubbers(_), do: [Pleroma.HTML.Scrubber.Default]
@@ -39,6 +38,7 @@ defmodule Pleroma.HTML do
callback \\ fn x -> x end
) do
key = "#{key}#{generate_scrubber_signature(scrubbers)}|#{activity.id}"
+
Cachex.fetch!(:scrubber_cache, key, fn _key ->
object = Pleroma.Object.normalize(activity)
ensure_scrubbed_html(content, scrubbers, object.data["fake"] || false, callback)
@@ -168,7 +168,6 @@ defmodule Pleroma.HTML.Scrubber.Default do
@valid_schemes Pleroma.Config.get([:uri_schemes, :valid_schemes], [])
-# Meta.remove_cdata_sections_before_scrub()
Meta.strip_comments()
Meta.allow_tag_with_uri_attributes(:a, ["href", "data-user", "data-tag"], @valid_schemes)