X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=abdeee947516214e472e2daa70361c2789d7131d;hb=04b1c135543965860029557fc216eb38fd63b6c7;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..abdeee947 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,26 +1,29 @@
# 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
+ alias Pleroma.Formatter
+ alias Pleroma.Object
+ alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web
- alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Endpoint
alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.ActivityPub.Utils
# 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
@@ -32,12 +35,28 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def get_replied_to_activity(_), do: nil
- def attachments_from_ids(ids) do
+ def attachments_from_ids(data) do
+ if Map.has_key?(data, "descriptions") do
+ attachments_from_ids_descs(data["media_ids"], data["descriptions"])
+ else
+ attachments_from_ids_no_descs(data["media_ids"])
+ end
+ end
+
+ def attachments_from_ids_no_descs(ids) do
Enum.map(ids || [], fn media_id ->
Repo.get(Object, media_id).data
end)
end
+ def attachments_from_ids_descs(ids, descs_str) do
+ {_, descs} = Jason.decode(descs_str)
+
+ Enum.map(ids || [], fn media_id ->
+ Map.put(Repo.get(Object, media_id).data, "name", descs[media_id])
+ end)
+ end
+
def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)
@@ -95,7 +114,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 +135,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 +154,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,59 +281,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 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
- 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)
- new_scrubber_cache = [%{:scrubbers => signature, :content => scrubbed_html} | new_scrubber_cache]
- update_scrubber_cache(activity, new_scrubber_cache)
- end
- scrubbed_html
- end
+ is_map(data["object"]) ->
+ data["object"]
- defp generate_scrubber_signature(scrubbers) do
- Enum.reduce(scrubbers, %{}, fn scrubber, signature ->
- Map.put(signature, to_string(scrubber), scrubber.version)
- end)
+ true ->
+ %{}
+ end
+
+ tagged_mentions = maybe_extract_mentions(object_data)
+
+ 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 maybe_extract_mentions(_), do: []
end