diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-17 16:52:59 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-17 16:52:59 +0000 |
| commit | b782739ffe2db8316b1e8a18e5c21e419462c5dd (patch) | |
| tree | cad5e473e45efad117d0996c9a16f608d4a286a3 /lib | |
| parent | 64b4de4af10ebac778b8069d88ef7515a53dfae5 (diff) | |
| parent | 20a496d2cbea18c563694c7026c0e951e99cfc3b (diff) | |
| download | pleroma-b782739ffe2db8316b1e8a18e5c21e419462c5dd.tar.gz | |
Merge branch 'feature/expose-post-formats' into 'develop'
Expose the post formats in /api/v1/instance
See merge request pleroma/pleroma!2776
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 5deb0d7ed..cd3bc7f00 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -41,7 +41,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do account_activation_required: Keyword.get(instance, :account_activation_required), features: features(), federation: federation(), - fields_limits: fields_limits() + fields_limits: fields_limits(), + post_formats: Config.get([:instance, :allowed_post_formats]) }, vapid_public_key: Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key) } |