Merge branch 'mastofe-content-types' into 'develop'

Set content types settings on mastofe endpoint.

See merge request pleroma/pleroma!894
This commit is contained in:
kaniini 2019-03-13 22:04:23 +00:00
commit 4e72762322
1 changed files with 2 additions and 1 deletions

View File

@ -1110,7 +1110,8 @@ def index(%{assigns: %{user: user}} = conn, _params) do
compose: %{ compose: %{
me: "#{user.id}", me: "#{user.id}",
default_privacy: user.info.default_scope, default_privacy: user.info.default_scope,
default_sensitive: false default_sensitive: false,
allow_content_types: Config.get([:instance, :allowed_post_formats])
}, },
media_attachments: %{ media_attachments: %{
accept_content_types: [ accept_content_types: [