X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=ea95c134c8d47eca8bce41e5609a385ed6c8b690;hb=d4b08dd838e06d302e0089bb2155bf5b56e5fbbe;hp=2d9fdaf6c0e32ede50db7bfeb68d356beb91eace;hpb=40c30ab895af8bbc5a77feee39f86ada34ffcc88;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 2d9fdaf6c..ea95c134c 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -24,17 +24,34 @@ 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 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
@@ -62,8 +79,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
def format_input(text, mentions, _tags) do
- Phoenix.HTML.html_escape(text)
- |> elem(1)
+ text
+ |> Formatter.html_escape
|> Formatter.linkify
|> String.replace("\n", "
")
|> add_user_links(mentions)
@@ -95,14 +112,15 @@ 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, cw \\ nil) 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,