diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-13 22:04:23 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-13 22:04:23 +0000 |
| commit | 4e72762322a5616ce426df62888ee3bc7af19dc8 (patch) | |
| tree | de7ee187c3ddac4df5fd1e6e4db114c8fef47ff8 /lib | |
| parent | 2029de5041d1687c914fe145a2cb6599b9677d54 (diff) | |
| parent | bf43f055ddbfdd8be065eace43de1a742674b1bc (diff) | |
| download | pleroma-4e72762322a5616ce426df62888ee3bc7af19dc8.tar.gz | |
Merge branch 'mastofe-content-types' into 'develop'
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 277c64fa4..e578f707e 100644 --- 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: [ |