Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
This commit is contained in:
commit
f333041a0a
64 changed files with 1191 additions and 212 deletions
|
|
@ -232,7 +232,8 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|
|||
in_reply_to,
|
||||
tags,
|
||||
cw \\ nil,
|
||||
cc \\ []
|
||||
cc \\ [],
|
||||
sensitive \\ false
|
||||
) do
|
||||
object = %{
|
||||
"type" => "Note",
|
||||
|
|
@ -240,6 +241,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|
|||
"cc" => cc,
|
||||
"content" => content_html,
|
||||
"summary" => cw,
|
||||
"sensitive" => !Enum.member?(["false", "False", "0", false], sensitive),
|
||||
"context" => context,
|
||||
"attachment" => attachments,
|
||||
"actor" => actor,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue