diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-01 09:33:50 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-01 09:33:50 +0000 |
| commit | ddab8d45ec48be823846bae4cbe2d32f627e0e59 (patch) | |
| tree | f3d0ca4e15c951d38e44e85befd366f1a8eca0f9 /lib | |
| parent | b3b0855456a92351667a50c8ea77f328bded76ca (diff) | |
| parent | 01d483f9c76456ed03010f5a0f5e08e118db27a8 (diff) | |
| download | pleroma-ddab8d45ec48be823846bae4cbe2d32f627e0e59.tar.gz | |
Merge branch 'fix-rich-media-toggle' into 'develop'
Remove default value for rich media.
See merge request pleroma/pleroma!751
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rich_media/helpers.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex index 44e876777..521fa7ee0 100644 --- a/lib/pleroma/web/rich_media/helpers.ex +++ b/lib/pleroma/web/rich_media/helpers.ex @@ -7,7 +7,7 @@ defmodule Pleroma.Web.RichMedia.Helpers do alias Pleroma.Web.RichMedia.Parser def fetch_data_for_activity(%Activity{} = activity) do - with true <- Pleroma.Config.get([:rich_media, :enabled], true), + with true <- Pleroma.Config.get([:rich_media, :enabled]), %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 |