diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-31 16:22:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-31 16:22:26 +0000 |
| commit | fb9730010e794a7f80c94b4320fd0591f2e7c93c (patch) | |
| tree | 90a2a6499cddfed17d203d6af11b46a3b9dad36a /lib | |
| parent | bd89cdbe318ce12e0273163a51f2907e6e763be6 (diff) | |
| parent | 7057891db649e1a72abfda13418d8c4bddd4ec92 (diff) | |
| download | pleroma-fb9730010e794a7f80c94b4320fd0591f2e7c93c.tar.gz | |
Merge branch 'fix/rich-media-disable-in-config' into 'develop'
Make rich media support toggleable
See merge request pleroma/pleroma!748
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rich_media/helpers.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex index 71fdddef9..44e876777 100644 --- a/lib/pleroma/web/rich_media/helpers.ex +++ b/lib/pleroma/web/rich_media/helpers.ex @@ -7,7 +7,8 @@ defmodule Pleroma.Web.RichMedia.Helpers do alias Pleroma.Web.RichMedia.Parser def fetch_data_for_activity(%Activity{} = activity) do - with %Object{} = object <- Object.normalize(activity.data["object"]), + with true <- Pleroma.Config.get([:rich_media, :enabled], true), + %Object{} = object <- Object.normalize(activity.data["object"]), {:ok, page_url} <- HTML.extract_first_external_url(object, object.data["content"]), {:ok, rich_media} <- Parser.parse(page_url) do %{page_url: page_url, rich_media: rich_media} |