diff options
| author | feld <feld@feld.me> | 2020-10-14 17:31:45 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-14 17:31:45 +0000 |
| commit | 20137056900f97af34f4433858cbdf69be6c9840 (patch) | |
| tree | 4920c30700ae1a338eff5ce4ca9ca408cdc04bd9 /lib/pleroma/web/mastodon_api | |
| parent | 9a85ec0da095933cbddfb1dae74d035723032399 (diff) | |
| parent | 40f3cdc030536d49c80fe7318ff43cd5ba011df4 (diff) | |
| download | pleroma-20137056900f97af34f4433858cbdf69be6c9840.tar.gz | |
Merge branch 'feature/gen-magic' into 'develop'
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/media_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex index 9586b14bc..161193134 100644 --- a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex @@ -11,6 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do alias Pleroma.Web.Plugs.OAuthScopesPlug action_fallback(Pleroma.Web.MastodonAPI.FallbackController) + plug(Majic.Plug, [pool: Pleroma.MajicPool] when action in [:create, :create2]) plug(Pleroma.Web.ApiSpec.CastAndValidate) plug(:put_view, Pleroma.Web.MastodonAPI.StatusView) |