diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-14 09:53:42 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-14 09:53:42 +0000 |
| commit | 9f211838eca3793bac8bbb6b64f200a8a6c8d29f (patch) | |
| tree | a2c642689f00da2b13069b258f8571f48126db18 /config | |
| parent | 592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e (diff) | |
| parent | 7af27c143d6c6f288be1e7d2fd2e2e9a439ececf (diff) | |
| download | pleroma-9f211838eca3793bac8bbb6b64f200a8a6c8d29f.tar.gz pleroma-9f211838eca3793bac8bbb6b64f200a8a6c8d29f.zip | |
Merge branch 'rich_media_parsers_configurable' into 'develop'
parsers configurable
See merge request pleroma/pleroma!1400
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 2ffa8c621..7d539f994 100644 --- a/config/config.exs +++ b/config/config.exs @@ -339,7 +339,12 @@ config :pleroma, :mrf_subchain, match_actor: %{} config :pleroma, :rich_media, enabled: true, ignore_hosts: [], - ignore_tld: ["local", "localdomain", "lan"] + ignore_tld: ["local", "localdomain", "lan"], + parsers: [ + Pleroma.Web.RichMedia.Parsers.TwitterCard, + Pleroma.Web.RichMedia.Parsers.OGP, + Pleroma.Web.RichMedia.Parsers.OEmbed + ] config :pleroma, :media_proxy, enabled: false, |