X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=208677bd755857f7b31af1dc113123a02be10839;hb=57549f60434250d538d61b926906c0b7d284c627;hp=759bd62af8751aaae2bd32bbe01f027e35921ba3;hpb=d9f40b05b30dd735d0dc87f8268db842bf8ad1f0;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 759bd62af..208677bd7 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
@@ -14,13 +14,13 @@ defmodule Pleroma.Web.CommonAPI.Utils do
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
- activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id)
+ activity = Repo.get(Activity, id) || Activity.get_create_by_object_ap_id(id)
activity &&
if activity.data["type"] == "Create" do
activity
else
- Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+ Activity.get_create_by_object_ap_id(activity.data["object"])
end
end
@@ -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
@@ -262,83 +262,45 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end)
end
- def get_scrubbed_html_for_object(content, scrubber, activity) when is_atom(scrubber) do
- get_scrubbed_html_for_object(content, [scrubber], activity)
- end
- @doc """
- Get sanitized HTML from cache, or scrub it and save to cache.
- """
- def get_scrubbed_html_for_object(
- content,
- scrubbers,
- %{data: %{"object" => object}} = activity
+ def maybe_notify_to_recipients(
+ recipients,
+ %Activity{data: %{"to" => to, "type" => _type}} = _activity
) do
- scrubber_cache =
- if is_list(object["scrubber_cache"]) do
- object["scrubber_cache"]
- else
- []
- end
+ recipients ++ to
+ 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
- else
- {entry, content}
- end
- end)
+ def maybe_notify_mentioned_recipients(
+ recipients,
+ %Activity{data: %{"to" => _to, "type" => type} = data} = _activity
+ )
+ when type == "Create" do
+ object = Object.normalize(data["object"])
- # Remove nil objects
- new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
+ object_data =
+ cond do
+ !is_nil(object) ->
+ object.data
- if scrubbed_html == nil or new_scrubber_cache != scrubber_cache do
- scrubbed_html = HTML.filter_tags(content, scrubbers)
+ is_map(data["object"]) ->
+ data["object"]
- new_scrubber_cache = [
- %{:scrubbers => signature, :content => scrubbed_html} | new_scrubber_cache
- ]
+ true ->
+ %{}
+ end
- update_scrubber_cache(activity, new_scrubber_cache)
- scrubbed_html
- else
- scrubbed_html
- end
- end
+ tagged_mentions = maybe_extract_mentions(object_data)
- defp generate_scrubber_signature(scrubbers) do
- Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
- Map.put(
- signature,
- to_string(scrubber),
- # If a scrubber does not have a version(e.g HtmlSanitizeEx.Scrubber) it is assumed it is always 0)
- if Kernel.function_exported?(scrubber, :version, 0) do
- scrubber.version
- else
- 0
- end
- )
- end)
+ recipients ++ tagged_mentions
end
- defp update_scrubber_cache(activity, scrubber_cache) do
- cng =
- Object.change(activity, %{
- data: Kernel.put_in(activity.data, ["object", "scrubber_cache"], scrubber_cache)
- })
+ def maybe_notify_mentioned_recipients(recipients, _), do: recipients
- {:ok, _struct} = Repo.update(cng)
+ def maybe_extract_mentions(%{"tag" => tag}) do
+ tag
+ |> Enum.filter(fn x -> is_map(x) end)
+ |> Enum.filter(fn x -> x["type"] == "Mention" end)
+ |> Enum.map(fn x -> x["href"] end)
end
- def get_stripped_html_for_object(content, activity) do
- get_scrubbed_html_for_object(content, [HtmlSanitizeEx.Scrubber.StripTags], activity)
- end
+ def maybe_extract_mentions(_), do: []
end