From: rinpatch <rinpatch@sdf.org>
Date: Tue, 29 Oct 2019 17:58:54 +0000 (+0300)
Subject: Remove commented-out code
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=77cfb08b8c4c07406af8b338ce010307f6af75cb;p=akkoma

Remove commented-out code
---

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)
diff --git a/mix.exs b/mix.exs
index 2e64b79ad..91b79dde2 100644
--- a/mix.exs
+++ b/mix.exs
@@ -109,7 +109,9 @@ defmodule Pleroma.Mixfile do
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
       {:html_sanitize_ex, "~> 1.3.0"},
-      {:fast_sanitize, git: "https://git.pleroma.social/pleroma/fast_sanitize.git", ref: "37f55e2bbe6eb44e8a9c4b3831a5ce73a2f6955c"},
+      {:fast_sanitize,
+       git: "https://git.pleroma.social/pleroma/fast_sanitize.git",
+       ref: "37f55e2bbe6eb44e8a9c4b3831a5ce73a2f6955c"},
       {:html_entities, "~> 0.4"},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},