X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=3ff9f9452bb8e79cd3814652cd79e047190593bd;hb=1b1e92866742e75de84201b079ffee48c769886e;hp=7b11bc3edad2d731625ecb9cc9c470425e5b571f;hpb=9a0163db53580182599a9358bd0197ee0c61779d;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 7b11bc3ed..3ff9f9452 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,11 +1,11 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors
+# Copyright © 2017-2019 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
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
@@ -261,65 +261,4 @@ defmodule Pleroma.Web.CommonAPI.Utils do
}
end)
end
-
- @doc """
- Get sanitized HTML from cache, or scrub it and save to cache.
- """
- def get_scrubbed_html(
- content,
- scrubbers,
- %{data: %{"object" => object}} = activity
- ) do
- scrubber_cache =
- if object["scrubber_cache"] != nil and is_list(object["scrubber_cache"]) do
- object["scrubber_cache"]
- else
- []
- end
-
- key = generate_scrubber_key(scrubbers)
-
- {new_scrubber_cache, scrubbed_html} =
- Enum.map_reduce(scrubber_cache, nil, fn %{
- :scrubbers => current_key,
- :content => current_content
- },
- _ ->
- if Map.keys(current_key) == Map.keys(key) do
- if scrubbers == key do
- {current_key, current_content}
- else
- # Remove the entry if scrubber version is outdated
- {nil, nil}
- end
- end
- end)
-
- new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
-
- if !(new_scrubber_cache == scrubber_cache) or scrubbed_html == nil do
- scrubbed_html = HTML.filter_tags(content, scrubbers)
- new_scrubber_cache = [%{:scrubbers => key, :content => scrubbed_html} | new_scrubber_cache]
- IO.puts(activity)
-
- activity =
- Map.put(
- activity,
- :data,
- Kernel.put_in(activity.data, ["object", "scrubber_cache"], new_scrubber_cache)
- )
-
- cng = Ecto.Changeset.change(activity)
- Repo.update(cng)
- scrubbed_html
- else
- scrubbed_html
- end
- end
-
- defp generate_scrubber_key(scrubbers) do
- Enum.reduce(scrubbers, %{}, fn scrubber, acc ->
- Map.put(acc, to_string(scrubber), scrubber.version)
- end)
- end
end