X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=7e30d224cef348d201ad67d3fb1da2dadaff6cf5;hb=e116e55cabb34d468866231d1690421792c27a0c;hp=d4c169ad930bb6a9921500f77e994802bdee16ce;hpb=bce152aba000e9b59562bf95f3a6df8540686317;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index d4c169ad9..7e30d224c 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
@@ -136,7 +136,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def format_input(text, mentions, _tags, "text/html") do
text
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "
")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
|> Formatter.finalize()
@@ -150,7 +149,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Formatter.mentions_escape(mentions)
|> Earmark.as_html!()
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "")
|> (&{[], &1}).()
|> Formatter.add_user_links(mentions)
|> Formatter.add_hashtag_links(tags)
@@ -261,60 +259,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 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
- 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)
- end
- scrubbed_html
- end
-
- defp generate_scrubber_signature(scrubbers) do
- Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
- Map.put(signature, to_string(scrubber), scrubber.version)
- 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
end