X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=e50d63d7753652c4646abc93d920bbf73e21a131;hb=2272934a5e5d5f2d0319381bd2f4dc322da78e18;hp=5c37fd6710db97c4392722b273c2ddaf9d7b4014;hpb=19f9889fbe9d120acfaed2a5aedb4032d56eb217;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 5c37fd671..e50d63d77 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,26 +1,24 @@
# 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.User
- alias Pleroma.Web
+ alias Pleroma.{Activity, Formatter, Object, Repo}
+ alias Pleroma.{User, Web}
+ alias Pleroma.Web.{Endpoint, MediaProxy}
alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.Endpoint
- alias Pleroma.Web.MediaProxy
# 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
@@ -95,7 +93,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id()
- def maybe_add_attachments(text, _attachments, _no_links = true), do: text
+ def maybe_add_attachments(text, _attachments, true = _no_links), do: text
def maybe_add_attachments(text, attachments, _no_links) do
add_attachments(text, attachments)
@@ -116,16 +114,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 +133,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,62 +260,45 @@ 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
+ def maybe_notify_to_recipients(
+ recipients,
+ %Activity{data: %{"to" => to, "type" => _type}} = _activity
) do
- scrubber_cache =
- if object["scrubber_cache"] != nil and is_list(object["scrubber_cache"]) do
- object["scrubber_cache"]
- else
- []
- end
+ recipients ++ to
+ 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)
+ def maybe_notify_mentioned_recipients(
+ recipients,
+ %Activity{data: %{"to" => _to, "type" => type} = data} = _activity
+ )
+ when type == "Create" do
+ object = Object.normalize(data["object"])
- new_scrubber_cache = Enum.reject(new_scrubber_cache, &is_nil/1)
+ object_data =
+ cond do
+ !is_nil(object) ->
+ object.data
- 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]
+ is_map(data["object"]) ->
+ data["object"]
- activity =
- Map.merge(activity, %{
- data: %{"object" => %{"scrubber_cache" => new_scrubber_cache}}
- })
+ true ->
+ %{}
+ end
- cng = Ecto.Changeset.change(activity)
- Repo.update(cng)
- scrubbed_html
- else
- IO.puts("got the post from cache")
- scrubbed_html
- end
+ tagged_mentions = maybe_extract_mentions(object_data)
+
+ recipients ++ tagged_mentions
end
- defp generate_scrubber_key(scrubbers) do
- Enum.reduce(scrubbers, %{}, fn scrubber, acc ->
- Map.put(acc, to_string(scrubber), scrubber.version)
- end)
+ def maybe_notify_mentioned_recipients(recipients, _), do: recipients
+
+ 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 maybe_extract_mentions(_), do: []
end