X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=a36ab5c158ae6984680f2843da7aff935b173d3c;hb=42612b1c8d356843b9e8785d3a91072f38fb50cf;hp=1aedbf96250e1f7ce774ccd122227338b36ea49f;hpb=66d1c31461826b34d5c907dc3a91e86cce808c3e;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 1aedbf962..a36ab5c15 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
@@ -116,16 +116,18 @@ defmodule Pleroma.Web.CommonAPI.Utils do
Enum.join([text | attachment_text], "
")
end
+ def format_input(text, mentions, tags, format, options \\ [])
+
@doc """
Formatting text to plain text.
"""
- def format_input(text, mentions, tags, "text/plain") do
+ def format_input(text, mentions, tags, "text/plain", options) do
text
|> Formatter.html_escape("text/plain")
|> String.replace(~r/\r?\n/, "
")
|> (&{[], &1}).()
|> Formatter.add_links()
- |> Formatter.add_user_links(mentions)
+ |> Formatter.add_user_links(mentions, options[:user_links] || [])
|> Formatter.add_hashtag_links(tags)
|> Formatter.finalize()
end
@@ -133,26 +135,24 @@ defmodule Pleroma.Web.CommonAPI.Utils do
@doc """
Formatting text to html.
"""
- def format_input(text, mentions, _tags, "text/html") do
+ def format_input(text, mentions, _tags, "text/html", options) do
text
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "
")
|> (&{[], &1}).()
- |> Formatter.add_user_links(mentions)
+ |> Formatter.add_user_links(mentions, options[:user_links] || [])
|> Formatter.finalize()
end
@doc """
Formatting text to markdown.
"""
- def format_input(text, mentions, tags, "text/markdown") do
+ def format_input(text, mentions, tags, "text/markdown", options) do
text
|> 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_user_links(mentions, options[:user_links] || [])
|> Formatter.add_hashtag_links(tags)
|> Formatter.finalize()
end
@@ -261,59 +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
- } = current_element,
- _content ->
- if Map.keys(current_key) == Map.keys(key) do
- if current_key == key do
- {current_element, 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 scrubbed_html == nil or new_scrubber_cache != scrubber_cache do
- scrubbed_html = HTML.filter_tags(content, scrubbers)
- new_scrubber_cache = [%{:scrubbers => key, :content => scrubbed_html} | new_scrubber_cache]
- update_scrubber_cache(activity, new_scrubber_cache)
- 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
-
- 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