X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=ea95c134c8d47eca8bce41e5609a385ed6c8b690;hb=d4b08dd838e06d302e0089bb2155bf5b56e5fbbe;hp=b649ee188dca8fa16e70c439f6152df4b03c321b;hpb=d659fcc1957600e7937af7e9a456af8bc452bbd8;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index b649ee188..ea95c134c 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -24,29 +24,50 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end)
end
- def to_for_user_and_mentions(user, mentions, inReplyTo) do
- default_to = [
- user.follower_address,
- "https://www.w3.org/ns/activitystreams#Public"
- ]
+ def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
+ to = ["https://www.w3.org/ns/activitystreams#Public"]
- to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+ mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+ cc = [user.follower_address | mentioned_users]
if inReplyTo do
- Enum.uniq([inReplyTo.data["actor"] | to])
+ {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
else
- to
+ {to, cc}
end
end
- def make_content_html(status, mentions, attachments) do
+ def to_for_user_and_mentions(user, mentions, inReplyTo, "unlisted") do
+ {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "public")
+ {cc, to}
+ end
+
+ def to_for_user_and_mentions(user, mentions, inReplyTo, "private") do
+ {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "direct")
+ {[user.follower_address | to], cc}
+ end
+
+ def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
+ mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+ if inReplyTo do
+ {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
+ else
+ {mentioned_users, []}
+ end
+ end
+
+ def make_content_html(status, mentions, attachments, tags, no_attachment_links \\ false) do
status
- |> format_input(mentions)
- |> add_attachments(attachments)
+ |> format_input(mentions, tags)
+ |> maybe_add_attachments(attachments, no_attachment_links)
end
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, _no_links) do
+ add_attachments(text, attachments)
+ end
def add_attachments(text, attachments) do
attachment_text = Enum.map(attachments, fn
(%{"url" => [%{"href" => href} | _]}) ->
@@ -54,14 +75,26 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"#{shortname(name)}"
_ -> ""
end)
- Enum.join([text | attachment_text], "
\n")
+ Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions) do
- HtmlSanitizeEx.strip_tags(text)
+ def format_input(text, mentions, _tags) do
+ text
+ |> Formatter.html_escape
|> Formatter.linkify
- |> String.replace("\n", "
\n")
+ |> String.replace("\n", "
")
|> add_user_links(mentions)
+ # |> add_tag_links(tags)
+ end
+
+ def add_tag_links(text, tags) do
+ tags = tags
+ |> Enum.sort_by(fn ({tag, _}) -> -String.length(tag) end)
+
+ Enum.reduce(tags, text, fn({full, tag}, text) ->
+ url = "##{tag}"
+ String.replace(text, full, url)
+ end)
end
def add_user_links(text, mentions) do
@@ -79,15 +112,17 @@ defmodule Pleroma.Web.CommonAPI.Utils do
Enum.reduce(mentions, step_one, fn ({match, %User{ap_id: ap_id}, uuid}, text) ->
short_match = String.split(match, "@") |> tl() |> hd()
- String.replace(text, uuid, "@#{short_match}")
+ String.replace(text, uuid, "@#{short_match}")
end)
end
- def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags) do
+ def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil, cc \\ []) do
object = %{
"type" => "Note",
"to" => to,
+ "cc" => cc,
"content" => content_html,
+ "summary" => cw,
"context" => context,
"attachment" => attachments,
"actor" => actor,