squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add "listMessage"

Browse Source
This commit is contained in:
Egor Kislitsyn 2019-07-11 16:36:08 +07:00
parent 182f7bbb11
commit 958fb9aa80
4 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/activity_pub/publisher.ex
View File

@ -136,7 +136,6 @@ defmodule Pleroma.Web.ActivityPub.Publisher do
json = json =
data data
|> Map.put("cc", cc) |> Map.put("cc", cc)
|> Map.put("directMessage", true)
|> Jason.encode!() |> Jason.encode!()
Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{ Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{

26
lib/pleroma/web/common_api/common_api.ex
View File

@ -215,7 +215,6 @@ defmodule Pleroma.Web.CommonAPI do
addressed_users <- get_addressed_users(mentioned_users, data["to"]), addressed_users <- get_addressed_users(mentioned_users, data["to"]),
{poll, poll_emoji} <- make_poll_data(data), {poll, poll_emoji} <- make_poll_data(data),
{to, cc} <- get_to_and_cc(user, addressed_users, in_reply_to, visibility), {to, cc} <- get_to_and_cc(user, addressed_users, in_reply_to, visibility),
bcc <- bcc_for_list(user, visibility),
context <- make_context(in_reply_to), context <- make_context(in_reply_to),
cw <- data["spoiler_text"] || "", cw <- data["spoiler_text"] || "",
sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}), sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}),
@ -241,16 +240,21 @@ defmodule Pleroma.Web.CommonAPI do
"emoji", "emoji",
Map.merge(Formatter.get_emoji_map(full_payload), poll_emoji) Map.merge(Formatter.get_emoji_map(full_payload), poll_emoji)
) do ) do
ActivityPub.create( preview? = Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false
%{ direct? = visibility == "direct"
to: to,
actor: user, additional_data =
context: context, %{"cc" => cc, "directMessage" => direct?} |> maybe_add_list_data(user, visibility)
object: object,
additional: %{"cc" => cc, "bcc" => bcc, "directMessage" => visibility == "direct"} params = %{
}, to: to,
Pleroma.Web.ControllerHelper.truthy_param?(data["preview"]) || false actor: user,
) context: context,
object: object,
additional: additional_data
}
ActivityPub.create(params, preview?)
else else
{:private_to_public, true} -> {:private_to_public, true} ->
{:error, dgettext("errors", "The message visibility must be direct")} {:error, dgettext("errors", "The message visibility must be direct")}

15
lib/pleroma/web/common_api/utils.ex
View File

@ -108,12 +108,19 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def get_addressed_users(mentioned_users, _), do: mentioned_users def get_addressed_users(mentioned_users, _), do: mentioned_users
def bcc_for_list(user, {:list, list_id}) do def maybe_add_list_data(additional_data, user, {:list, list_id}) do
list = Pleroma.List.get(list_id, user) case Pleroma.List.get(list_id, user) do
[list.ap_id] %Pleroma.List{} = list ->
additional_data
|> Map.put("listMessage", list.ap_id)
|> Map.put("bcc", [list.ap_id])
_ ->
additional_data
end
end end
def bcc_for_list(_, _), do: [] def maybe_add_list_data(additional_data, _, _), do: additional_data
def make_poll_data(%{"poll" => %{"options" => options, "expires_in" => expires_in}} = data) def make_poll_data(%{"poll" => %{"options" => options, "expires_in" => expires_in}} = data)
when is_list(options) do when is_list(options) do

1
test/web/common_api/common_api_test.exs
View File

@ -139,6 +139,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert activity.data["bcc"] == [list.ap_id] assert activity.data["bcc"] == [list.ap_id]
assert activity.recipients == [list.ap_id, user.ap_id] assert activity.recipients == [list.ap_id, user.ap_id]
assert activity.data["listMessage"] == list.ap_id
end end
end end