MastodonAPI: Post with visibility settings

This commit is contained in:
lain 2018-02-18 14:45:08 +01:00
parent 539340d914
commit d4b08dd838
3 changed files with 33 additions and 14 deletions

View file

@ -49,19 +49,20 @@ defmodule Pleroma.Web.CommonAPI do
@instance Application.get_env(:pleroma, :instance) @instance Application.get_env(:pleroma, :instance)
@limit Keyword.get(@instance, :limit) @limit Keyword.get(@instance, :limit)
def post(user, %{"status" => status} = data) do def post(user, %{"status" => status} = data) do
visibility = data["visibility"] || "public"
with status <- String.trim(status), with status <- String.trim(status),
length when length in 1..@limit <- String.length(status), length when length in 1..@limit <- String.length(status),
attachments <- attachments_from_ids(data["media_ids"]), attachments <- attachments_from_ids(data["media_ids"]),
mentions <- Formatter.parse_mentions(status), mentions <- Formatter.parse_mentions(status),
inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]), inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
to <- to_for_user_and_mentions(user, mentions, inReplyTo), {to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility),
tags <- Formatter.parse_tags(status, data), tags <- Formatter.parse_tags(status, data),
content_html <- make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]), content_html <- make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]),
context <- make_context(inReplyTo), context <- make_context(inReplyTo),
cw <- data["spoiler_text"], cw <- data["spoiler_text"],
object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw), object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw, cc),
object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => to}}) res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => cc}})
User.increase_note_count(user) User.increase_note_count(user)
res res
end end

View file

@ -24,17 +24,34 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end) end)
end end
def to_for_user_and_mentions(user, mentions, inReplyTo) do def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
default_to = [ to = ["https://www.w3.org/ns/activitystreams#Public"]
user.follower_address,
"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 if inReplyTo do
Enum.uniq([inReplyTo.data["actor"] | to]) {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
else 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
end end
@ -99,10 +116,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end) end)
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 = %{ object = %{
"type" => "Note", "type" => "Note",
"to" => to, "to" => to,
"cc" => cc,
"content" => content_html, "content" => content_html,
"summary" => cw, "summary" => cw,
"context" => context, "context" => context,

View file

@ -116,8 +116,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
cond do cond do
public in to -> "public" public in to -> "public"
public in cc -> "unlisted" public in cc -> "unlisted"
[] == cc -> "direct" Enum.any?(to, &(String.contains?(&1, "/followers"))) -> "private"
true -> "private" true -> "direct"
end end
end end