commit: 4e72762322a5616ce426df62888ee3bc7af19dc8
parent: 2029de5041d1687c914fe145a2cb6599b9677d54
Author: kaniini <nenolod@gmail.com>
Date: Wed, 13 Mar 2019 22:04:23 +0000
Merge branch 'mastofe-content-types' into 'develop'
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1110,7 +1110,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
compose: %{
me: "#{user.id}",
default_privacy: user.info.default_scope,
- default_sensitive: false
+ default_sensitive: false,
+ allow_content_types: Config.get([:instance, :allowed_post_formats])
},
media_attachments: %{
accept_content_types: [